From: Wolfram Schneider Date: Mon, 7 Jul 2014 16:25:05 +0000 (+0000) Subject: Merge remote branch 'origin/master' into wosch X-Git-Tag: 1.0.0~39^2~24 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=41af6e8df5945d73d546785595c9b768cb2955df;p=mkws-moved-to-github.git Merge remote branch 'origin/master' into wosch --- 41af6e8df5945d73d546785595c9b768cb2955df