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

Trivial merge