Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 26 Mar 2014 03:35:47 +0000 (16:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 26 Mar 2014 03:35:47 +0000 (16:35 +1300)

Trivial merge