Merge branch 'MDL-34050_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
commitebe2f5a19c7616e85f73f9da2b266394c67df1e3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 15:47:32 +0000 (21 16:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 15:47:32 +0000 (21 16:47 +0100)
tree2ca764a51df07a34c6d2f121be7a2106c7a194b2
parent72389d113328f775fc70f2a02b0cc713c9845ac3
parent96d6ab3a12f1857067dcde096c88401c2d3d8a21
Merge branch 'MDL-34050_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE