Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 03:36:55 +0000 (15:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 03:36:55 +0000 (15:36 +1200)
1  2 
calendar/lib.php

Simple merge