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

Trivial merge