merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 10:21:23 +0000 (11:21 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 10:21:23 +0000 (11:21 +0100)
commitbcd7eff4bc99ca6d1a9f780a58027adad6e46ae7
tree74a852d26ec9d1ca31e0ae28403896d34ace4a4e
parent46dac08bb29caa7d7c192f2e23753ed39c259e72
parent91bbd1eeaec88ce578cf984b6620a260ecaf5c7a
merge 0.19.x branch into master