Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 20 Oct 2014 15:58:45 +0000 (17:58 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 20 Oct 2014 15:58:45 +0000 (17:58 +0200)
1  2 
examples/htdocs/two-teams.html

Simple merge