From: zuber <marek@stepniowski.com>
Date: Sat, 10 Oct 2009 23:10:20 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/46fdcc29313a6c0dd897b8060335061f433897fd?ds=inline;hp=46fdcc29313a6c0dd897b8060335061f433897fd

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
	fabfile.py
---