Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 05:02:38 +0000 (13:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 05:02:38 +0000 (13:02 +0800)

Trivial merge