Merge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 12:37:37 +0000 (13:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 12:37:37 +0000 (13:37 +0100)

Trivial merge