From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 9 Aug 2012 13:44:14 +0000 (+0200)
Subject: Merge branch 'oaipmh'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6ff3ca2d4ba9d131d5a3a96e9f74573668980f0b?ds=inline;hp=--cc

Merge branch 'oaipmh'

Conflicts:
	requirements.txt
---

6ff3ca2d4ba9d131d5a3a96e9f74573668980f0b