Merge branch 'MDL-36400-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 22:01:15 +0000 (11:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 22:01:15 +0000 (11:01 +1300)

Trivial merge