Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 07:10:52 +0000 (15:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 07:10:52 +0000 (15:10 +0800)

Trivial merge