Merge branch 'MDL-33125' of git://github.com/aolley/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:19:32 +0000 (10:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:19:32 +0000 (10:19 +1300)

Trivial merge