Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Apr 2014 16:04:18 +0000 (16:04 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 7 Apr 2014 16:04:18 +0000 (16:04 +0000)

Trivial merge