Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Jul 2014 14:35:54 +0000 (14:35 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Jul 2014 14:35:54 +0000 (14:35 +0000)

Trivial merge