Alexandra Panyukova 86bde1693e Merge remote branch 'cas/school-lite' into school-lite ... Conflicts: branding.spec images/boot.jpg images/wallpaper.png notes/release-notes.all.html.in notes/release-notes.ru.html.in		2009-10-19 17:31:11 +04:00
..
kde4/share/config	Merge remote branch 'cas/school-lite' into school-lite	2009-10-19 17:31:11 +04:00
menu	Merge remote branch 'cas/school-master' into school-master	2009-10-19 16:40:47 +04:00