merge branch 0.19.x into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 11 Oct 2013 16:03:18 +0000 (18:03 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 11 Oct 2013 16:03:18 +0000 (18:03 +0200)
commit063637107f867a8dde83c74239e1a611e0718095
tree206572b2a608abdb2c70dfeb3f58aeb4fd22818f
parent656196c30526004704be7b74970c41337be35f0a
parent2388e9327892a438440b522ff5c43d817458ed99
merge branch 0.19.x into master