Merge branch 'MDL-36592-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 03:42:52 +0000 (16:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 03:42:52 +0000 (16:42 +1300)

Trivial merge