Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 25 Apr 2014 15:03:23 +0000 (15:03 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 25 Apr 2014 15:03:23 +0000 (15:03 +0000)

Trivial merge