Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Sat, 10 Oct 2009 23:10:20 +0000 (01:10 +0200)
committerzuber <marek@stepniowski.com>
Sat, 10 Oct 2009 23:10:20 +0000 (01:10 +0200)
commit46fdcc29313a6c0dd897b8060335061f433897fd
tree975786b762f90eb9febf2a096ded250f16c25fb5
parentaee39efde819f0381a7aa65bc32145d2709cf088
parent1a65a8d09e07f68e9dde662430719cfa84a0fd77
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
fabfile.py
fabfile.py