Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Jul 2014 07:38:53 +0000 (07:38 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Jul 2014 07:38:53 +0000 (07:38 +0000)

Trivial merge