Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 17:48:02 +0000 (19:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 17:48:02 +0000 (19:48 +0200)

Trivial merge