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)
commit5a6c9f1cfbf4ae137227325f2ee6bcca9dc28e18
tree9373c86b535a1d92d11a2a56e7edbe728de3def0
parent35d236c1ea53bf8d852049ccfca132e2a0e24e47
parentde881693f7fca3356e5ef9963891ab12979db4e4
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle

Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php