Merge branch 'MDL-27891-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:36:21 +0000 (11:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:36:21 +0000 (11:36 +0100)

Trivial merge