From: sapier <sapier at gmx dot net>
Date: Tue, 7 Feb 2012 15:57:36 +0000 (+0100)
Subject: Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_col... 
X-Git-Tag: sapier-20120207~2^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c525330153f07acaf5b22073e7b33745135314f5;p=oweals%2Fminetest.git

Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_collision
---

c525330153f07acaf5b22073e7b33745135314f5