merged a conflict in dcparser fields
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 10:16:31 +0000 (11:16 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 10:16:31 +0000 (11:16 +0100)
commit1f3e067b075c8c20609c4ebbada2c543f2717082
tree5f1d8a28ff4b568ca10485dcdd90ded87c735ecb
parent262c7082c23ab266254175438d1524470996c4d2
parent808e7c2967440cacbc15af82cde171e10aea8a6a
merged a conflict in dcparser fields
librarian/dcparser.py