Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 22 Aug 2013 09:49:21 +0000 (09:49 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 22 Aug 2013 09:49:21 +0000 (09:49 +0000)

Trivial merge