From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 10 Jul 2013 15:28:39 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 0.9.1~275
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=073be95d012b356da93f53b9d9b7e8a65bd181c9;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into wosch
---

073be95d012b356da93f53b9d9b7e8a65bd181c9