Merge branch 'MDL-35023_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitc06b18a47554bbb4ebeb815ba46db70972619db9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:34:02 +0000 (27 16:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:34:02 +0000 (27 16:34 +0200)
tree4f52afdd93dcddb3b2abf7fd0dff47bacecdec58
parentaa81647c4c65f3c46113359d3e37a87fb67e3e2c
parente60c61e570c1bc21f33ef74536cdbae3e8e1898d
Merge branch 'MDL-35023_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE