Merge branch 'MDL-30893-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:52:59 +0000 (11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:52:59 +0000 (11:52 +1300)

Trivial merge