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)
Conflicts:
requirements.txt

1  2 
requirements.txt

Simple merge