Merge branch 'MDL-44550-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:43:42 +0000 (09:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:43:42 +0000 (09:43 +1300)

Trivial merge