Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorHeikki Levanto <heikki@indexdata.dk>
Thu, 27 Feb 2014 15:27:29 +0000 (16:27 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Thu, 27 Feb 2014 15:27:29 +0000 (16:27 +0100)

Trivial merge