Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 19 May 2014 15:50:58 +0000 (15:50 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 19 May 2014 15:50:58 +0000 (15:50 +0000)

Trivial merge