Merge branch 'MDL-39084-moodle23' of github.com:StudiUM/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Fri, 19 Apr 2013 06:07:38 +0000 (14:07 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 19 Apr 2013 06:07:38 +0000 (14:07 +0800)

Trivial merge