Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:33:01 +0000 (08:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:33:01 +0000 (08:33 +1300)

Trivial merge