Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 05:54:27 +0000 (13:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 05:54:27 +0000 (13:54 +0800)

Trivial merge