Merge branch 'MDL-38184_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Mar 2013 08:35:19 +0000 (16:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Mar 2013 08:35:19 +0000 (16:35 +0800)

Trivial merge