From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Tue, 20 Dec 2011 09:35:55 +0000 (+0100)
Subject: Merge branch 'picture' into pretty
X-Git-Tag: 1.7~182
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/262c7082c23ab266254175438d1524470996c4d2?hp=262c7082c23ab266254175438d1524470996c4d2

Merge branch 'picture' into pretty

Conflicts:
	librarian/dcparser.py
---