Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 03:11:40 +0000 (11:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 03:11:40 +0000 (11:11 +0800)
commit8bfd0e618786c9c6bd1eadeb142b19f023acbcf5
treec44bd081f262c2cb172cb8283bd7399b3f4f8c64
parent29752d05ae21f35696bd109391bb23d7602adea9
parentc3c3c9f28a253e9d22930c3f1939fa1bb7b51a1d
Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle