Merge branch 'master' into 3219-further-docker-improvements
authorWard Vandewege <ward@curoverse.com>
Tue, 22 Jul 2014 18:21:13 +0000 (14:21 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 22 Jul 2014 18:21:13 +0000 (14:21 -0400)
commit190d0f110dab5d51dcfa7b13ff658583fdd21a5d
treea61966bb11d245945b48683b60f00ebbba45e9f4
parent97f3ab858482c9d68972fa0fe3cb887d7968fcc7
parentf0abaec0c637772b781993a63b98aab85072eb97
Merge branch 'master' into 3219-further-docker-improvements