Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 21 Jul 2014 13:51:11 +0000 (13:51 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 21 Jul 2014 13:51:11 +0000 (13:51 +0000)

Trivial merge