Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Apr 2014 18:02:40 +0000 (18:02 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Apr 2014 18:02:40 +0000 (18:02 +0000)

Trivial merge