Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:14:37 +0000 (09:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:14:37 +0000 (09:14 +1200)

Trivial merge