Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 17 Apr 2014 12:25:29 +0000 (12:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 17 Apr 2014 12:25:29 +0000 (12:25 +0000)

Trivial merge