3824: Merge branch 'master' into 3824-crunch-container-setup
authorTom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 17:02:56 +0000 (13:02 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 17:02:56 +0000 (13:02 -0400)
commit51e79a3be745cfd37efc49471ae21a1d54662e7f
treeeae4a1379fb8dd8a0468af4b16f1c2b34aa3fb0c
parent1bcf9398f365411b2a82388dbd2eb1fd1d570fe5
parente2fe6c0e5c1c62a37e03519590c04a5186a2cc9b
3824: Merge branch 'master' into 3824-crunch-container-setup