Merge branch 'MDL-37552-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 May 2013 04:44:46 +0000 (12:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 May 2013 04:44:46 +0000 (12:44 +0800)

Trivial merge