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

Trivial merge