merge 0.18 branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:31:33 +0000 (14:31 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:31:33 +0000 (14:31 +0100)
commit0964e2b1fb8f0cf04cd685aaab2eda7677ef5f92
tree3585a48ae752f97082e1ffd4d6f76d1360948b7a
parentd34a3ee641dfa94c527cbf0f4bcd5946e805dcbc
parent939f8f85deb1730030bfda1fd95a2fdccbb8a713
merge 0.18 branch back into master