Merge branch 'master' into 3219-further-docker-improvements
authorWard Vandewege <ward@curoverse.com>
Tue, 29 Jul 2014 20:32:56 +0000 (22:32 +0200)
committerWard Vandewege <ward@curoverse.com>
Tue, 29 Jul 2014 20:32:56 +0000 (22:32 +0200)
commit6d3636939f60a96d8ede920fec474079d713c7e1
tree1d2b8f58acda2541ea24b32a48d5fc238a4f5c20
parent82c23c04e3105dfd0d2167a53552df56b0a81785
parent7a54fd6a073e03f98f68d0b6c816a9f394f625dd
Merge branch 'master' into 3219-further-docker-improvements