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

Trivial merge