Merge branch 'wip-mdl-38332-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Mar 2013 21:58:12 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Mar 2013 21:58:12 +0000 (22:58 +0100)

Trivial merge