Merge branch 'MDL-14730_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE
commitc5203c98bf2180c9426e885985f25d045f4489da
authorDan Poltawski <dan@moodle.com>
Wed, 14 Jan 2015 10:27:46 +0000 (14 10:27 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jan 2015 10:27:46 +0000 (14 10:27 +0000)
tree94720202072cd5fc0371157c63282bc78eac5217
parent27cf863db58a04116ee1e0ac065c9a1b50070284
parent6d4858392b879320a11ec4222fbb6a2552b45970
Merge branch 'MDL-14730_28' of git://github.com/jmvedrine/moodle into MOODLE_28_STABLE
mod/lesson/locallib.php