Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE
commitdc21606e4fedabbed5aa95d6be058a3c876ca1cd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:57 +0000 (10 11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:57 +0000 (10 11:13 +0100)
tree6c3984e762041d069c19808ad466a5236ad57585
parentc7fbbf73e3f501d4247989a0667871ceefaf4ac1
parent8946805511e0a1f5b84b6bc5bee87e77381cec4b
Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE