Merge branch 'MDL-36615-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Nov 2012 21:25:04 +0000 (10:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Nov 2012 21:25:04 +0000 (10:25 +1300)

Trivial merge