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

Trivial merge