Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 06:21:38 +0000 (14:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 06:21:38 +0000 (14:21 +0800)

Trivial merge