Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 28 Oct 2014 08:08:15 +0000 (08:08 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 28 Oct 2014 08:08:15 +0000 (08:08 +0000)

Trivial merge