Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 12 Aug 2014 08:59:51 +0000 (08:59 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 12 Aug 2014 08:59:51 +0000 (08:59 +0000)

Trivial merge