Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)

Trivial merge