Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Feb 2013 00:07:04 +0000 (01:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Feb 2013 00:07:04 +0000 (01:07 +0100)

Trivial merge