Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:53:05 +0000 (00:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:53:05 +0000 (00:53 +0200)

Trivial merge