Merge branch 'MDL-41305-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:14:40 +0000 (17:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:14:40 +0000 (17:14 +0800)
commit89cb942c6d19595274e4fd5594baff4dd8803e59
treef9b1a0b4046b2b55e4500f691b2c0d4bc11bbe49
parentd184f9bd4a1b74010b9c6a3b27f9a5fb7c10a9ba
parent5995717e22cb4ec11d007a4e154e1febe50e0b82
Merge branch 'MDL-41305-master' of git://github.com/FMCorz/moodle