Merge branch 'wip-mdl-35787-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 02:58:59 +0000 (10:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 02:58:59 +0000 (10:58 +0800)

Trivial merge