Merge branch 'wip-mdl-35910-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:00:21 +0000 (10:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:00:21 +0000 (10:00 +0800)

Trivial merge