Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 16 Aug 2013 11:17:59 +0000 (11:17 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 16 Aug 2013 11:17:59 +0000 (11:17 +0000)

Trivial merge