Merge branch 'wosch'
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 1 Jul 2013 14:26:30 +0000 (14:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 1 Jul 2013 14:26:30 +0000 (14:26 +0000)
Conflicts:
experiments/spclient/index-mobile.html
experiments/spclient/mkws.js


Trivial merge