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)
commite41cdaf18a6fa7cb61034c77902cb2b0177eb108
treef695ba902649ab4bfbcf6a16b16a14bdf3c04fc2
parent15a552487b8c79ebb12847a422d65d5e63974b87
parentdbf20420162cad30c3a3495d99ff1bdf941c880b
Merge remote-tracking branch 'origin/master' into mkws-294
src/mkws-popup.js
src/mkws-team.js