Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 12:00:25 +0000 (12:00 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 12:00:25 +0000 (12:00 +0000)

Trivial merge