Merge branch 'MDL-34430_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:51:01 +0000 (18:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:51:01 +0000 (18:51 +0200)
commit9507653269c3ffb253cb0f7bdd0d89c752690c43
treee829e03d62d116ab3ad984d466c25e65cd24365b
parent79a6a832d7e0eaf0819272ff06a0f32bff903415
parent49e77191ccf50cd3d205e69bd6f1604fed023461
Merge branch 'MDL-34430_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE