Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:47:52 +0000 (01:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:47:52 +0000 (01:47 +0100)

Trivial merge