From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 20 Jun 2013 11:45:34 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch
X-Git-Tag: 0.9.1~575
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=01d95c59750f32341a720843030e3c44b264f8e1

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

Conflicts:
	experiments/spclient/mkws.js
---

01d95c59750f32341a720843030e3c44b264f8e1