Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)
1  2 
calendar/lib.php

Simple merge