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

Trivial merge