Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 9 Jul 2014 12:17:57 +0000 (12:17 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 9 Jul 2014 12:17:57 +0000 (12:17 +0000)

Trivial merge