Merge branch 'picture' into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 16 Dec 2011 16:12:33 +0000 (17:12 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 16 Dec 2011 16:12:33 +0000 (17:12 +0100)
commit05b19dad8ca44136e064abcc6beff5dac4489c60
tree9d85f819067676295a150b9182f6f27766eac586
parent48acd2e1b4ad0a64661091dff97122b2a53e4685
parenta3c860f00c7d12ae5852ddab056c98f52ee43072
Merge branch 'picture' into pretty

Conflicts:
librarian/dcparser.py
librarian/__init__.py
librarian/dcparser.py