Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 13:21:03 +0000 (13:21 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 24 Apr 2014 13:21:03 +0000 (13:21 +0000)

Trivial merge