Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:18:03 +0000 (12:18 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 23 Apr 2014 12:18:03 +0000 (12:18 +0000)

Trivial merge