Merge branch 'master' into onload
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 3 Jan 2014 15:16:33 +0000 (15:16 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 3 Jan 2014 15:16:33 +0000 (15:16 +0000)
commit3cd7917e3ada63d397a128a681685c1b7cab04c1
tree6caeeda455986b1dc5222b7422c86ddf7b6c7380
parent647f730f5db9be01f6424d02447101c692e4a505
parent31f9b5677ed8f67be53ac8121e170b2f87ff3576
Merge branch 'master' into onload

Conflicts:
tools/htdocs/mkws.js
tools/htdocs/mkws.js