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

Trivial merge