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

Trivial merge