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)
commitdfb597b447e0061776a6ddb7ec017daf4400636d
tree6cd4a4d9178742c574b8e6ed493ea1f2bb49e311
parent86558590a46d854852b47bb6517c4183c220d078
parente2ec154ec10fada09c0f70704821927a24baa848
Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle
calendar/lib.php