From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 16 Dec 2011 16:12:33 +0000 (+0100)
Subject: Merge branch 'picture' into pretty
X-Git-Tag: 1.7~181^2~1
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/05b19dad8ca44136e064abcc6beff5dac4489c60?hp=05b19dad8ca44136e064abcc6beff5dac4489c60

Merge branch 'picture' into pretty

Conflicts:
	librarian/dcparser.py
---