Code

Merge branch 'contrib-docker-cleanup'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 19:53:48 +0000 (20:53 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 19:53:48 +0000 (20:53 +0100)
commitb9f877bc827ea4c0097682fc87cc5bcfd0000807
tree1f1216a2b2a37df842541e5cc27ed22edbb254a4
parentc7c89cc9618ef25cc9b0861ac2782cb1a5d6782d
parent2c2a8af7bcc3529dabe2a1cb71386f41259fba69
Merge branch 'contrib-docker-cleanup'