Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 15 May 2014 11:28:49 +0000 (11:28 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 15 May 2014 11:28:49 +0000 (11:28 +0000)

Trivial merge