Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 04:28:57 +0000 (17:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 04:28:57 +0000 (17:28 +1300)
commit0b49b6daa75325f0c7504c2b5e14bdda99afc03e
tree913e96b5e72f2a14b7b07d781977647e8180c534
parent5e255d5ad86a980411320ca5c63c4e96e278da27
parenteb59a448f7879d69b21fcde7f1fcddd69655e045
Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle