Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 22 Jun 2012 02:40:09 +0000 (14:40 +1200)
committerSam Hemelryk <sam@moodle.com>
Fri, 22 Jun 2012 02:40:09 +0000 (14:40 +1200)

Trivial merge