Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Jul 2014 16:25:05 +0000 (16:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Jul 2014 16:25:05 +0000 (16:25 +0000)

Trivial merge