Merge branch 'oaipmh'
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 9 Aug 2012 13:44:14 +0000 (15:44 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 9 Aug 2012 13:44:14 +0000 (15:44 +0200)
commit6ff3ca2d4ba9d131d5a3a96e9f74573668980f0b
tree60546f108cb0adf004375628ff842ce3ad6056db
parent67905ab03cb741371bd13c4f6775544b93388b3c
parent38cc2bc1fec598a380371358d0a9d0b6cf4d9f05
Merge branch 'oaipmh'

Conflicts:
requirements.txt
requirements.txt