Merge branch 'MDL-6340' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 00:44:01 +0000 (08:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 00:44:01 +0000 (08:44 +0800)
commitb51ff393cd0437240416ce1cc695a44f79eeaf38
tree9352a1ecef2a777996522e38bff88bb6ff6be5ef
parent73edc9b12ea0b1881c5fc8577cdfb8f95ba8cb17
parentbb93fc24aa10ae910fb4a494b0e8ef132b924758
Merge branch 'MDL-6340' of git://github.com/timhunt/moodle