Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:11:16 +0000 (12:11 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:11:16 +0000 (12:11 +0000)
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php


Trivial merge