Merge branch 'MDL-34862_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit4dd7c5cafd214eda4a04cda6ac4c8e7444014a10
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:32:59 +0000 (15 03:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:32:59 +0000 (15 03:32 +0200)
tree4d7c05d735fe874e8c9ff975dd473da41168c07a
parent5d44dbd1eb2a2f7564a273a68a21f32f0266aa94
parent1907f7e082f072ddf48ed2904892b35b9f847f3a
Merge branch 'MDL-34862_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE