Merge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 05:57:30 +0000 (13:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 05:57:30 +0000 (13:57 +0800)
commit68e8a61fb194f84861a88c0271f9081898e03be7
tree29e82ac1067ed130e824f4eba3573e924dc5d5a7
parent94d4d0179a819a2132cef78a3657bf09f35faa43
parent18ec7521da0ff12d6fb67f59ff34de5a50b286c1
Merge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle