Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 22:15:35 +0000 (22:15 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 22:15:35 +0000 (22:15 +0000)

Trivial merge