From: Gary Macbook Date: Wed, 18 Nov 2015 23:21:39 +0000 (+0100) Subject: Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=2b42795995fd8b7372f37f2c469f0517bfad8bb1;p=test.git Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test Conflicts solved automatically this time. --- 2b42795995fd8b7372f37f2c469f0517bfad8bb1