Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)

Trivial merge