From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Tue, 11 Oct 2011 10:33:07 +0000 (+0200)
Subject: Merge branch 'redakcja-api'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/60b06883b6d5a336ef47c01103ec1ce25aafae69?hp=60b06883b6d5a336ef47c01103ec1ce25aafae69

Merge branch 'redakcja-api'

Conflicts:
	apps/api/handlers.py
	apps/api/urls.py
---