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)
commit3f7149be26baf7bc0fa52e0bb810c72ffb428532
treef47f4a572799abf210330e00434742dfe32f4c59
parent8c10eed89e419a000dd3c467006fb89cfc8e33ee
parent41c142756db759d01f04b818baa02f43ee34f6c4
Merge branch 'wosch'

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