Merge branch 'MDL-30940-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:04:26 +0000 (14:04 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:04:26 +0000 (14:04 +0800)

Trivial merge