Sagi Dayan a684e59628 Merge conflict fix		2014-09-11 15:27:00 +03:00
..
CalendarManager.cpp	Merge conflict fix	2014-09-11 15:27:00 +03:00
CalendarManager.h	Fixes to the Calendar Dialog. QA	2014-09-09 21:24:53 +03:00