Merge branch 'wip-mdl-34239-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 04:05:25 +0000 (12:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 04:05:25 +0000 (12:05 +0800)

Trivial merge