Merge branch 'master' of \\\pk2010\Pithos\
-rw-r--r-- 982 .gitgnore
drwxr-xr-x - trunk