Merge branch 'MDL-31671-master2' of git://github.com/ankitagarwal/moodle
commit301cf946a69b10732f311306ecdd1596a885f993
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 05:42:03 +0000 (8 17:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 05:42:03 +0000 (8 17:42 +1200)
tree31684b4607236f6596be74d8e37c028cd91e9c81
parent4022860ea823b302ee60ddc37d0d9321b1961a83
parent5ff114adaefda13207e3e20a21ac332e08eb9832
Merge branch 'MDL-31671-master2' of git://github.com/ankitagarwal/moodle
calendar/lib.php