From: Marcin Koziej <marcin@lolownia.org>
Date: Tue, 17 Jul 2012 09:38:10 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/55416847d9b5329ebbacbf44ebfadf5a92332764?hp=-c

Merge branch 'master' of https://github.com/fnp/wolnelektury

Conflicts:
	apps/opds/views.py
---

55416847d9b5329ebbacbf44ebfadf5a92332764