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)
commit7835a4302a611440bd3be646edbabbbe48cc745a
treedfd93b152fbce2b3316bdad3bf0f2f25749eee51
parent6bce7bdad808e1b2e5b64da14fee4f5f10d63c08
parent132f1c9dd205f4bda88d54255dca1843b1981655
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

Conflicts:
tools/htdocs/mkws-jquery.js