Merge branch 'MDL-31193-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 May 2013 07:28:24 +0000 (15:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 May 2013 07:28:24 +0000 (15:28 +0800)

Trivial merge