Merge remote-tracking branch 'upstream/develop' into develop

CHANGES.txt

@@ -1,12 +1,19 @@
 CHANGELOG
 =====================
 
-0.12.21 (unreleased)
+0.12.22 (unreleased)
 --------------------
 
 - Nothing changed yet.
 
 
+0.12.21 (2014-05-27)
+--------------------
+
+- Dispatching custom objects, slots supported.
+  [Davorin Kunstelj]
+
+
 0.12.20 (2014-05-15)
 --------------------
 - better version handling [kiorky]

setup.py

@@ -17,7 +17,7 @@ long_description="SOAPpy provides tools for building SOAP clients and servers.
     +'\n'+read('CHANGES.txt')
 setup(
     name="SOAPpy",
-    version='0.12.21.dev0',
+    version='0.12.22.dev0',
     description="SOAP Services for Python",
     maintainer="Gregory Warnes, kiorky",
     maintainer_email="Gregory.R.Warnes@Pfizer.com, kiorky@cryptelium.net",