Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)

Trivial merge