Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 30 Apr 2014 08:35:23 +0000 (08:35 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 30 Apr 2014 08:35:23 +0000 (08:35 +0000)

Trivial merge