Merge branch 'MDL-44364-master-more' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 22:18:07 +0000 (11:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 22:18:07 +0000 (11:18 +1300)

Trivial merge