Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 13 Jun 2014 13:17:48 +0000 (13:17 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 13 Jun 2014 13:17:48 +0000 (13:17 +0000)

Trivial merge