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

Trivial merge