Merge branch 'MDL-35889-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 02:48:54 +0000 (15:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 02:48:54 +0000 (15:48 +1300)

Trivial merge