From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 21 Jun 2013 09:04:26 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 0.9.1~574
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=6b8a2657249b9280fd89dbf80ac2523e94f8361c;p=mkws-moved-to-github.git

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

6b8a2657249b9280fd89dbf80ac2523e94f8361c