Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:57:07 +0000 (21:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:57:07 +0000 (21:57 +0200)

Trivial merge