Merge branch 'wosch'
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 19 Aug 2013 12:37:34 +0000 (14:37 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 19 Aug 2013 12:37:34 +0000 (14:37 +0200)

Trivial merge