Pedro Beschorner Marin f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1		2017-04-04 20:42:15 +00:00
..
lib	Merge remote-tracking branch 'mconf/mconf'	2017-03-20 19:45:59 +00:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf'	2017-03-20 19:45:59 +00:00