Merge branch 'MDL-36855-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 23:05:26 +0000 (12:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 23:05:26 +0000 (12:05 +1300)

Trivial merge