Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jan 2014 14:44:08 +0000 (14:44 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jan 2014 14:44:08 +0000 (14:44 +0000)

Trivial merge