Joachim Hill-Grannec 529a9eba49 Merge branch 'master' into bbserver-cleanup ... updated to also include build config updates # Conflicts: # remote/bitbucketserver/bitbucketserver.go		2016-08-11 13:35:47 -07:00
..
internal	Merge branch 'master' into bbserver-cleanup	2016-08-11 13:35:47 -07:00
bitbucketserver.go	Merge branch 'master' into bbserver-cleanup	2016-08-11 13:35:47 -07:00
convert.go	Merge branch 'master' into bbserver-cleanup	2016-08-11 13:35:47 -07:00
parse.go	Merge branch 'master' into bbserver-cleanup	2016-08-11 13:35:47 -07:00