From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 1 Jul 2013 14:26:30 +0000 (+0000)
Subject: Merge branch 'wosch'
X-Git-Tag: 0.9.1~396
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=3f7149be26baf7bc0fa52e0bb810c72ffb428532;p=mkws-moved-to-github.git

Merge branch 'wosch'

Conflicts:
	experiments/spclient/index-mobile.html
	experiments/spclient/mkws.js
---

3f7149be26baf7bc0fa52e0bb810c72ffb428532