Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 12 May 2014 13:23:30 +0000 (13:23 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 12 May 2014 13:23:30 +0000 (13:23 +0000)

Trivial merge