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

Trivial merge