Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)
1  2 
calendar/lib.php

Simple merge