Merge branch 'MDL-38311_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 00:24:22 +0000 (01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 00:24:22 +0000 (01:24 +0100)

Trivial merge