Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 22:58:10 +0000 (11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 22:58:10 +0000 (11:58 +1300)

Trivial merge