Merge branch 'MDL-44381-M27' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:32:37 +0000 (14:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:32:37 +0000 (14:32 +1300)

Trivial merge