Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Sat, 19 Apr 2014 08:05:47 +0000 (08:05 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Sat, 19 Apr 2014 08:05:47 +0000 (08:05 +0000)

Trivial merge