Sam Hemelryk 36546841f1 Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/lib.php
	lib/db/caches.php
	version.php
2013-01-22 16:35:03 +13:00
..
2012-08-11 20:40:01 +02:00