merge branch 0.19.x
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 17 Jul 2013 19:24:37 +0000 (21:24 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 17 Jul 2013 19:24:37 +0000 (21:24 +0200)
commit2edd942384fd4db5c9891aa705c6d047a783e55d
tree7c453b39f67472f5119043f05669502689a42592
parent5ac221498ed64c6cc0338e6f1d80c58b06bbf1c2
parentdb7d6bd229e08e8b9be845bfe862fa3ca0c566b5
merge branch 0.19.x