Merge branch 'wip-MDL-40847-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 07:28:17 +0000 (15:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 07:28:17 +0000 (15:28 +0800)

Trivial merge