Aparup Banerjee 6bf410ed4b Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/lib.php (MDL-36615)
	calendar/managesubscriptions_form.php (MDL-36352)
2012-11-21 10:29:04 +08:00
..
2012-09-03 18:49:53 +02:00
2012-10-16 13:32:34 +08:00
2012-09-07 02:36:04 +02:00
2012-09-02 16:10:57 +02:00
2012-10-20 15:22:15 +08:00
2012-10-30 17:33:18 +13:00
2012-04-21 22:17:41 +02:00
2012-11-15 11:16:35 +08:00