Merge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:15:31 +0000 (10:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:15:31 +0000 (10:15 +0800)

Trivial merge