Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 11 Aug 2014 08:30:10 +0000 (08:30 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 11 Aug 2014 08:30:10 +0000 (08:30 +0000)

Trivial merge