Merge branch 'MDL-30422-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 25 Nov 2011 00:13:06 +0000 (13:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Fri, 25 Nov 2011 00:13:06 +0000 (13:13 +1300)

Trivial merge