From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 18 Mar 2014 09:51:27 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~1314
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=7835a4302a611440bd3be646edbabbbe48cc745a

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

Conflicts:
	tools/htdocs/mkws-jquery.js
---

7835a4302a611440bd3be646edbabbbe48cc745a