From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Thu, 16 Apr 2015 13:21:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.mdrn.pl/django-ssify
X-Git-Tag: 0.2.5~1
X-Git-Url: https://git.mdrn.pl/django-ssify.git/commitdiff_plain/325450f83527058794f7b9f5e76348afa9a06ec4?hp=325450f83527058794f7b9f5e76348afa9a06ec4

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

Conflicts:
	tox.ini
---