Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:07:47 +0000 (22:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:07:47 +0000 (22:07 +0200)

Trivial merge