Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 15 Oct 2014 11:41:01 +0000 (13:41 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 15 Oct 2014 11:41:01 +0000 (13:41 +0200)

Trivial merge