Merge branch 'master' of ssh://Kagamin@repo.or.cz/srv/git/chanspy
treea6d6a1e6ba400ff656691ab97fb784b56f95f607
-rw-r--r-- 6 .gitignore
drwxr-xr-x - bumper
drwxr-xr-x - daemon.shit
drwxr-xr-x - gui.shit
drwxr-xr-x - other
-rwxr-xr-x 120 prepare_for_commit.sh
drwxr-xr-x - server