Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:12:44 +0000 (10:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:12:44 +0000 (10:12 +0800)
commit660ca679f70880e930608c99c05e8d698bd16da6
tree4c845a915cf38fb63170d4bf5dd549cea405badc
parent25ffb8d56196ba4d188bf208bfc2a467777dae62
parent5b0af6e4b19ba2145b2574e875c23aa8a08a8c75
Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle