Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 00:54:48 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 00:54:48 +0000 (13:54 +1300)

Trivial merge