Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 4 Jul 2014 10:42:50 +0000 (10:42 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 4 Jul 2014 10:42:50 +0000 (10:42 +0000)

Trivial merge