Merge branch 'MDL-36197_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:30:49 +0000 (11:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:30:49 +0000 (11:30 +1300)

Trivial merge