Merge branch 'picture' into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 09:35:55 +0000 (10:35 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 09:35:55 +0000 (10:35 +0100)
commit262c7082c23ab266254175438d1524470996c4d2
tree3c0622808f05dce0f8997150037af4a683f84aa9
parent48acd2e1b4ad0a64661091dff97122b2a53e4685
parent4f20e472f079e7692718fcfd445a4e4a7bfbb786
Merge branch 'picture' into pretty

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