Merge branch 'MDL-38101-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 20:29:35 +0000 (09:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 20:29:35 +0000 (09:29 +1300)

Trivial merge