Merge branch 'MDL-30996-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 01:10:40 +0000 (02:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 01:10:40 +0000 (02:10 +0100)

Trivial merge