Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:10:11 +0000 (23:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:10:11 +0000 (23:10 +0100)

Trivial merge