Merge branch 'MDL-39535_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 02:38:37 +0000 (10:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 02:38:37 +0000 (10:38 +0800)

Trivial merge