liranbg 910372a363 Merge remote-tracking branch 'origin/Staging' into Dev ... Conflicts: main/CourseTab/coursestablemanager.cpp		2014-10-16 10:28:59 +03:00
..
coursestablemanager.cpp	Merge remote-tracking branch 'origin/Staging' into Dev	2014-10-16 10:28:59 +03:00
coursestablemanager.h	headers fix	2014-10-15 11:55:12 +03:00