merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:10:37 +0000 (10:10 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:10:37 +0000 (10:10 +0200)
commit46d075e9d1b92f69e227e2e9e7cd0abc617087af
tree8d99e9ef357849248d83f847e2e203b84142ade0
parentf94ad59754a0f0b1cef4a334b988a21392a738c0
parent39d9e0fc4304d2497b946580064fb658d02db1b6
merge 0.19.x branch into master