David Baker 0a6664493a Merge branch 'master' into pushers		2014-12-18 15:06:11 +00:00
..
unjingle	Remove editor junk	2014-12-02 18:01:16 +00:00
jitsimeetbridge.py	convert to spaces before I start a holy war	2014-12-02 14:10:24 +00:00
syweb-jitsi-conference.patch	Add non-working jitsi meet bridge	2014-12-02 18:01:16 +00:00