Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 09:04:26 +0000 (09:04 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 09:04:26 +0000 (09:04 +0000)

Trivial merge