From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 20 Oct 2009 12:42:45 +0000 (+0200)
Subject: Merge branch 'master' of stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0e5e4a0d816add3c0c13559fbed4f79eb295baf8?ds=sidebyside;hp=0e5e4a0d816add3c0c13559fbed4f79eb295baf8

Merge branch 'master' of stigma:platforma

Conflicts:
	platforma/urls.py
---