Merge branch 'master' into 4383-easy-install
authorWard Vandewege <ward@curoverse.com>
Wed, 5 Nov 2014 15:21:24 +0000 (10:21 -0500)
committerWard Vandewege <ward@curoverse.com>
Wed, 5 Nov 2014 15:21:24 +0000 (10:21 -0500)
commit611a3323ea110671c5fa021e14f93b24e4a6d7b7
tree79d8efedb3c94406e4f059990ff2c05c05ff5a33
parent18e63e25f167b25ccebbcb7eb2953c6e5d805fbb
parentd5cf000ee76060ce5e96bb4032f54e7f6b19116e
Merge branch 'master' into 4383-easy-install

Conflicts:
docker/api/application.yml.in

refs #4383