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

Trivial merge