Merge branch 'MDL-38460_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE
commit745a0dc66019d68172568230e18231d7ccad7c4b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 20:14:55 +0000 (19 21:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 20:14:55 +0000 (19 21:14 +0100)
tree55e67a918ba1e1c7660eff88098ac3980abb8e27
parentdc122b32b3338cec0ff843533797488ffa908a44
parentb7295e8e5d0a24e5aa6745615bfb6640f5a6d56b
Merge branch 'MDL-38460_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE