Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 5 Feb 2014 13:22:43 +0000 (13:22 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 5 Feb 2014 13:22:43 +0000 (13:22 +0000)

Trivial merge