merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 11:11:38 +0000 (13:11 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 11:11:38 +0000 (13:11 +0200)
commit7be2f7abf70f5133175d49110a90a3df7e3ed9e2
tree687e6497855f9821da98e9182d23fe18f9815921
parent02189e8a30d91d6754e44cebced29e6a173e5ccf
parentc3590cc412dee5624ef2e8d21ce59e3a609719c9
merge 0.19.x branch into master