Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Jan 2014 13:00:34 +0000 (13:00 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Jan 2014 13:00:34 +0000 (13:00 +0000)

Trivial merge