Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 7 Aug 2014 12:03:02 +0000 (12:03 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 7 Aug 2014 12:03:02 +0000 (12:03 +0000)

Trivial merge