Merge branch 'feature-py_srp_compat' into develop develop
authorAzul <azul@riseup.net>
Fri, 5 Oct 2012 10:44:47 +0000 (12:44 +0200)
committerAzul <azul@riseup.net>
Fri, 5 Oct 2012 10:44:47 +0000 (12:44 +0200)

Trivial merge