Merge branch 'MDL-35055_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitaa81647c4c65f3c46113359d3e37a87fb67e3e2c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:17:06 +0000 (27 16:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:17:06 +0000 (27 16:17 +0200)
treed9a8c93f2b6b8b7c07d24b0146becdbf19876aba
parentad24b3a3206be19e3693b2ce1607fbcacc873fad
parent170130d7565a3036b4b9cc82332561892fb9fbd1
Merge branch 'MDL-35055_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE