Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 14:51:25 +0000 (14:51 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 16 Apr 2014 14:51:25 +0000 (14:51 +0000)

Trivial merge