Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 22 May 2014 07:38:55 +0000 (09:38 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 22 May 2014 07:38:55 +0000 (09:38 +0200)

Trivial merge