Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:29:57 +0000 (14:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:29:57 +0000 (14:29 +0800)

Trivial merge