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

Trivial merge