Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 09:23:31 +0000 (09:23 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 09:23:31 +0000 (09:23 +0000)

Trivial merge