Merge branch 'wip-mdl-37633-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 07:50:10 +0000 (15:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 07:50:10 +0000 (15:50 +0800)

Trivial merge