Merge branch 'MDL-33122-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 22:54:48 +0000 (10:54 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 22:54:48 +0000 (10:54 +1200)

Trivial merge