Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Oct 2014 13:17:43 +0000 (14:17 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Oct 2014 13:17:43 +0000 (14:17 +0100)

Trivial merge