merge 0.18 branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:36:58 +0000 (14:36 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:36:58 +0000 (14:36 +0100)
commit871da512a7a356e8dd0b1e9f953dcc0ff6601621
treeef7db780b418ed997d19763fb21e1e9bef498d56
parent0964e2b1fb8f0cf04cd685aaab2eda7677ef5f92
parentf2889b8c78792472447a9662698b6cccf718494a
merge 0.18 branch back into master