Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 21 Jan 2015 13:28:23 +0000 (13:28 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 21 Jan 2015 13:28:23 +0000 (13:28 +0000)

Trivial merge