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)
commit7762129834afab32dbdd4b16e79b4fd487d1fafe
tree63e226e1df93e95a8e9be2494c8d58ab5d04839c
parent9683634eb18843151d318b483a5fb237508f4755
parentce246cb722f7f61b3a1ba7223857627f1bed4f4c
Merge branch 'feature-py_srp_compat' into develop