Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Mar 2012 21:28:14 +0000 (10:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Mar 2012 21:28:14 +0000 (10:28 +1300)

Trivial merge