Merge branch 'wip-mdl-30798-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 06:26:08 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 06:26:08 +0000 (14:26 +0800)

Trivial merge