Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 8 May 2014 14:53:55 +0000 (14:53 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 8 May 2014 14:53:55 +0000 (14:53 +0000)

Trivial merge