Merge branch 'master' of git@github.com:fnp/redakcja
authorroot <root@debian.localdomain>
Mon, 16 Aug 2010 10:42:38 +0000 (05:42 -0500)
committerroot <root@debian.localdomain>
Mon, 16 Aug 2010 10:42:38 +0000 (05:42 -0500)

Trivial merge