Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 6 May 2014 07:07:06 +0000 (07:07 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 6 May 2014 07:07:06 +0000 (07:07 +0000)

Trivial merge