Merge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 17 Nov 2011 00:11:46 +0000 (13:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 17 Nov 2011 00:11:46 +0000 (13:11 +1300)

Trivial merge