Merge branch 'wip-mdl-29762-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Wed, 31 Oct 2012 02:50:53 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 31 Oct 2012 02:50:53 +0000 (10:50 +0800)

Trivial merge