Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 10 Sep 2014 11:06:10 +0000 (11:06 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 10 Sep 2014 11:06:10 +0000 (11:06 +0000)

Trivial merge