Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 14:25:32 +0000 (14:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 7 May 2014 14:25:32 +0000 (14:25 +0000)

Trivial merge