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

Trivial merge