Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 20:38:24 +0000 (09:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 20:38:24 +0000 (09:38 +1300)

Trivial merge