merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Mon, 28 Jan 2013 21:44:28 +0000 (22:44 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Mon, 28 Jan 2013 21:44:28 +0000 (22:44 +0100)
commitb675cd67dc8c821367d52186dbb1506d8a3b66ec
treee2bd9f78dbcd784a0693282e4907a1eff71492a7
parent2dadb472cc52cb39a36d497cb0d12f55f37cbebe
parentafbd83a1f460fbca9375e56908300ba6b65f85bb
merge 0.18.x branch into master