Merge branch 'wip-mdl-34606-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Sep 2012 00:09:25 +0000 (02:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Sep 2012 00:09:25 +0000 (02:09 +0200)

Trivial merge