Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Mar 2016 02:37:25 +0000 (10:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Mar 2016 02:37:25 +0000 (10:37 +0800)
commitf7074f5db472931315fefcdda629eb60a3c7d55a
treee72082aaf5cbe752af41cbe2cefd984d76938b66
parent981649256a2f4411c9331c3a48d32e61edbe3263
parentdd399f51abbab4819af19d6a522fac0f766aca40
Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle