Merge branch 'm23_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
commit3a3120e2067a765305a6d90103e64170c3e06455
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:57:21 +0000 (11 01:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:57:21 +0000 (11 01:57 +0200)
tree0b12f75060404ba919f04388c1516d06900608a0
parentf34cb5797ced98250a499e41ec454104d040073f
parent70c2ec0ba26041dbebd358285b5b322cc7cd5149
Merge branch 'm23_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE