Merge branch 'MDL-39192_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 22:53:33 +0000 (10:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 22:53:33 +0000 (10:53 +1200)

Trivial merge