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

Trivial merge