Merge branch 'MDL-34862_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:32:44 +0000 (03:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:32:44 +0000 (03:32 +0200)

Trivial merge