Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 03:28:16 +0000 (16:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 03:28:16 +0000 (16:28 +1300)

Trivial merge