Merge branch 'MDL-38352' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Mar 2013 10:45:06 +0000 (11:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Mar 2013 10:45:06 +0000 (11:45 +0100)

Trivial merge