Merge branch 'MDL-30815-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 00:45:04 +0000 (13:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 00:45:04 +0000 (13:45 +1300)

Trivial merge