Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 14:44:05 +0000 (14:44 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 14:44:05 +0000 (14:44 +0000)

Trivial merge