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