Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)

Trivial merge