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

Trivial merge