Merge branch 'oaipmh'

Conflicts:
	requirements.txt

diff --combined requirements.txt
index 5dffaad,70cf8b9..f94a945
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -6,11 -6,11 +6,11 @@@ South>=0.7 # migrations for djang
  django-pipeline>=1.2
  django-pagination>=1.0
  django-maintenancemode>=0.10
- django-piston
+ django-piston<=0.2.3
  #django-jsonfield
  -e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
  django-picklefield
 -django-allauth<=0.4.0
 +django-allauth>=0.4,<0.5
  django-honeypot
  django-uni-form
  
@@@ -38,3 -38,8 +38,8 @@@ django-komb
  
  # spell checking
  pyenchant
+ 
+ # OAI-PMH
+ pyoai
+ 
+