Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:46:15 +0000 (02:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:46:15 +0000 (02:46 +0200)

Trivial merge