Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 22:52:24 +0000 (10:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 22:52:24 +0000 (10:52 +1200)

Trivial merge