Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 18 Mar 2014 09:51:27 +0000 (09:51 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 18 Mar 2014 09:51:27 +0000 (09:51 +0000)
Conflicts:
tools/htdocs/mkws-jquery.js


Trivial merge