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

Trivial merge