Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 20 Jun 2013 11:45:34 +0000 (11:45 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 20 Jun 2013 11:45:34 +0000 (11:45 +0000)
Conflicts:
experiments/spclient/mkws.js


Trivial merge