Merge branch 'MDL-30440-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:04:37 +0000 (13:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:04:37 +0000 (13:04 +1300)

Trivial merge