Felipe Cecagno 59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1		2014-10-05 23:32:43 -03:00
..
playback/presentation	Merge branch 'mconf-branding-0.81' into 090-mconf-branding	2014-10-05 19:36:43 -03:00
scripts	Actually fix slide indexes.	2014-09-09 17:15:57 -04:00