Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Jul 2013 06:09:24 +0000 (14:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Jul 2013 06:09:24 +0000 (14:09 +0800)

Trivial merge