Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 17:34:59 +0000 (18:34 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 7 Nov 2014 17:34:59 +0000 (18:34 +0100)

Trivial merge