Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 09:45:22 +0000 (17:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 09:45:22 +0000 (17:45 +0800)
commitb300c1deba3edc1a75af3f09deedb26b70a41874
tree51983b15551da5e2a3ae1d627398d4345fccb04e
parent53018f5fc433dfaf08c3311f878574da4304417d
parente82aa0439999791cec0d7526d7b0457a083a9808
Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle