Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 28 Jun 2013 10:53:55 +0000 (10:53 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 28 Jun 2013 10:53:55 +0000 (10:53 +0000)

Trivial merge