Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:12:59 +0000 (16:12 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 14:12:59 +0000 (16:12 +0200)
1  2 
tools/htdocs/mkws.js

Simple merge