merge 0.18.x branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 20 Jan 2013 08:29:38 +0000 (09:29 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 20 Jan 2013 08:29:38 +0000 (09:29 +0100)
commit04897b1f1f1c0c850ef7fcc631e7aec2269e9241
treea389effce77378a2719c41382c3b871e22d98f84
parent86a3d9e72804e72e2fa659f95f368597dbba619c
parent617e50e6b553e8760bc1e8277578baa1e8e6c7a3
merge 0.18.x branch back into master