Merge branch 'MDL-34145_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit3021f92c8ce6eb72256217da1e349d6324f18b57
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 01:41:38 +0000 (5 03:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 01:41:38 +0000 (5 03:41 +0200)
treea2539f0d98f9a74adc4d489d8a82be476cb8cda4
parentdb948187be28b042dc1b7b4b9228b20ac1959282
parent78040342e09c1473e1e7768b5477197828cafd48
Merge branch 'MDL-34145_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE