Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:19:45 +0000 (16:19 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:19:45 +0000 (16:19 +0200)

Trivial merge