Merge remote-tracking branch 'origin/master' into mkws-294
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:29:38 +0000 (18:29 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:29:38 +0000 (18:29 +0200)
1  2 
src/mkws-popup.js
src/mkws-team.js

Simple merge
Simple merge