Merge branch 'wip-mdl-30691-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 08:27:51 +0000 (16:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 08:27:51 +0000 (16:27 +0800)

Trivial merge