Merge branch 'MDL-52260-29-2' of git://github.com/xow/moodle into MOODLE_29_STABLE
commit1a62cb7567806bc7e61647d023b74944f63521d7
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 02:03:08 +0000 (2 10:03 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:57:04 +0000 (3 11:57 +0100)
treebe7d7f105b0599fa1824f8cd0dba3fb1c424e3f4
parent3a1a3639aa622b79c09deaad086460dfb72e6beb
parent66620e48b725f57a9c7d651f583f1e3482f6e61e
Merge branch 'MDL-52260-29-2' of git://github.com/xow/moodle into MOODLE_29_STABLE