Merge branch 'wip-mdl-31498-default' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 05:26:33 +0000 (13:26 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 05:26:33 +0000 (13:26 +0800)

Trivial merge