Merge branch 'wip-mdl-30121-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:15:14 +0000 (12:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:15:14 +0000 (12:15 +0200)

Trivial merge