Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 21:29:21 +0000 (22:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 21:29:21 +0000 (22:29 +0100)

Trivial merge