3824: Merge branch 'master' into 3824-docker-fixes
authorTom Clegg <tom@curoverse.com>
Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)
commit5185c0d7e1d9aa8ea4abe46e4bbc0927e52e9a66
tree137e52eadb9898bd811dbfa6e3cce1a0c39d94be
parent5c375252581488d15345f0dbd8aba7dd3cfa6977
parentb77fb69914fda0aedecddf2e62076cb404265647
3824: Merge branch 'master' into 3824-docker-fixes