Merge branch 'MDL-52260-30-2' of git://github.com/xow/moodle into MOODLE_30_STABLE
commit8dbe8449e0e004b06487f2dd5ca5e096c00615e2
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 02:02:53 +0000 (2 10:02 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:53:13 +0000 (3 11:53 +0100)
treedd7c2e7abf0a52940da410995a29da0fd0e3fed0
parent484116921181e640d7a9563572f7c2bcbe50d05d
parent9c461eae4e77011ab903aa58275626a106ea5fbb
Merge branch 'MDL-52260-30-2' of git://github.com/xow/moodle into MOODLE_30_STABLE