merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 3 Nov 2013 17:31:34 +0000 (18:31 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 3 Nov 2013 17:31:34 +0000 (18:31 +0100)
commit3cf7a9b83f38d265de9c72bcf08107f556e84e47
tree317fbfded1fbc1ede2c6bde42610c89facda47c3
parent4d5c1c4ee88e34d504bf452a5797649cc7c8c9b9
parent0c6fdf066588732f96d0f90eeace517de7a91f42
merge 0.19.x branch into master