Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle

Conflicts:
	mod/lesson/version.php

diff --cc mod/lesson/lang/en/lesson.php
index 502f32a,dcb5294..3e2b032
--- 1/mod/lesson/lang/en/lesson.php
--- 2/mod/lesson/lang/en/lesson.php
+++ b/mod/lesson/lang/en/lesson.php
@@@ -182,9 -179,10 +182,11 @@@ $string['eventessayattemptviewed'] = 'E
  $string['eventhighscoreadded'] = 'Highscore added';
  $string['eventhighscoresviewed'] = 'Highscores viewed';
  $string['eventlessonended'] = 'Lesson ended';
+ $string['eventlessonrestarted'] = 'Lesson restarted';
+ $string['eventlessonresumed'] = 'Lesson resumed';
  $string['eventlessonstarted'] = 'Lesson started';
  $string['eventpagecreated'] = 'Page created';
 +$string['eventpagemoved'] = 'Page moved';
  $string['eventpageupdated'] = 'Page updated';
  $string['eventpagedeleted'] = 'Page deleted';
  $string['eventquestionanswered'] = 'Question answered';

diff --cc mod/lesson/locallib.php
Simple merge

diff --cc mod/lesson/tests/events_test.php
Simple merge

diff --cc mod/lesson/version.php
index d6a8b34,e4c1c3f..1bd6fe5
--- 1/mod/lesson/version.php
--- 2/mod/lesson/version.php
+++ b/mod/lesson/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2015032400;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2015031800;       // The current module version (Date: YYYYMMDDXX)
++$plugin->version   = 2015032401;       // The current module version (Date: YYYYMMDDXX)
  $plugin->requires  = 2014110400;    // Requires this Moodle version
  $plugin->component = 'mod_lesson'; // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;