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

Trivial merge