5 Commits (197c14dbcfa9bc5bb281833a91ee035cb154216d)

Author	SHA1	Message	Date
David Baker	0a6664493a	Merge branch 'master' into pushers	2014-12-18 15:06:11 +00:00
Paul "LeoNerd" Evans	d8b35250a5	Remove editor junk	2014-12-02 18:01:16 +00:00
David Baker	48f90036d8	Add non-working jitsi meet bridge	2014-12-02 18:01:16 +00:00
David Baker	bdc21e7282	convert to spaces before I start a holy war	2014-12-02 14:10:24 +00:00
David Baker	758052d7f8	Add non-working jitsi meet bridge	2014-12-02 12:01:30 +00:00