Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)
1  2 
calendar/lib.php

Simple merge