Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 15:02:37 +0000 (15:02 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 15:02:37 +0000 (15:02 +0000)

Trivial merge