Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 06:26:35 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 06:26:35 +0000 (14:26 +0800)

Trivial merge