Merge branch 'wip-mdl-30466' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 18:45:39 +0000 (19:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 18:45:39 +0000 (19:45 +0100)

Trivial merge