Pedro Beschorner Marin b89a31bb9a Merge remote-tracking branch 'playback-speedup' into mconf ... Conflicts: record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js record-and-playback/presentation/scripts/process/presentation.rb record-and-playback/presentation/scripts/publish/presentation.rb record-and-playback/presentation_export/playback/presentation_export/lib/writing.js		2017-01-26 18:10:20 +00:00
..
presentation	Merge remote-tracking branch 'playback-speedup' into mconf	2017-01-26 18:10:20 +00:00