Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 12:11:43 +0000 (12:11 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 12:11:43 +0000 (12:11 +0000)

Trivial merge