Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)

Trivial merge