Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 02:42:45 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 02:42:45 +0000 (10:42 +0800)

Trivial merge