Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 21:57:38 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 21:57:38 +0000 (10:57 +1300)

Trivial merge