Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)

Trivial merge