dupa
Merge branch 'master' of https://github.com/quetz05/tin
costamdziala
Merge branch 'master' of https://github.com/quetz05/tin
ad
tatata
Merge branch 'master' of https://github.com/quetz05/tin

Conflicts:
	build-TIN-klient-Desktop_Qt_5_0_2_GCC_32bit-Debug/TIN-klient
ss