merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 05:09:07 +0000 (07:09 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 05:09:07 +0000 (07:09 +0200)
1  2 
CHANGES.rst

diff --cc CHANGES.rst
Simple merge