Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 21:03:06 +0000 (23:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 21:03:06 +0000 (23:03 +0200)

Trivial merge