Merge branch 'MDL-34072' of git://github.com/appalachianstate/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Jul 2012 22:10:54 +0000 (10:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Jul 2012 22:10:54 +0000 (10:10 +1200)

Trivial merge