Merge branch 'MDL-34430_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit3dd9961f449fb367fff5e737c5edd3fc6ade3cbd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:51:25 +0000 (27 18:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:51:25 +0000 (27 18:51 +0200)
tree8c94f5df0d9961ccf74380e7f1201a0c83777179
parent006052e19c127f24379ce2032ce94541b3cd0caa
parent4458b51cc48388913cf3b960dfd1a199cacec5f0
Merge branch 'MDL-34430_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE