Merge branch 'MDL-30158-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 23:22:13 +0000 (00:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 23:22:13 +0000 (00:22 +0100)

Trivial merge