Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:48:22 +0000 (02:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:48:22 +0000 (02:48 +0200)
commita59f0f25cdfb4e6215a5395764d326fdc2dd0da4
treef0ea827e47352d72024581b2b16d1c309774cb2e
parent35eb1a0f0cd0161a517734d0b1fe45b621db2312
parent43b135e5989ca1b9194e3b44e43a2adf8e79f2b6
Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE