Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:11:58 +0000 (13:11 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:11:58 +0000 (13:11 +0800)

Trivial merge