merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 5 Jul 2013 18:05:51 +0000 (20:05 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 5 Jul 2013 18:05:51 +0000 (20:05 +0200)
1  2 
setup.py

diff --cc setup.py
Simple merge