Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 22:48:22 +0000 (11:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 22:48:22 +0000 (11:48 +1300)

Trivial merge