Merge branch '43033-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 01:33:39 +0000 (09:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 01:33:39 +0000 (09:33 +0800)
commitecfbb657f3e782c79cb9a4e955ad612a7607155e
treeff417888c0999c8b4c7a6cbbe19a9c8e69e259df
parentc619d3d48d92077a01cbdcd71a87f85464565db6
parent1e9f4c98e3d7a7988a89bb5b4da15b499e0717fb
Merge branch '43033-27' of git://github.com/samhemelryk/moodle