Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 08:43:34 +0000 (16:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 08:43:34 +0000 (16:43 +0800)

Trivial merge