Merge branch 'wip-mdl-32759-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:34:04 +0000 (02:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:34:04 +0000 (02:34 +0200)

Trivial merge