Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Jul 2014 17:09:02 +0000 (17:09 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Jul 2014 17:09:02 +0000 (17:09 +0000)

Trivial merge