Merge branch 'master' of ssh://git.mdrn.pl/django-ssify