Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)
commit58014c562114a1525d03e9782ca4bff1322a0a0c
tree4e41f83cf499987827832568309770a8bb0d74a2
parent2644c4f33a41be316a7e44d339b7393af1ce584b
parent462e42cb9a9ee8352755654e6f03c2cf0b0711a2
Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
calendar/lib.php