Merge branch 'MDL-30775-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 May 2013 08:22:48 +0000 (16:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 May 2013 08:22:48 +0000 (16:22 +0800)

Trivial merge