Merge branch 'MDL-38668' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)

Trivial merge