From: sapier <sapier at gmx dot net>
Date: Sun, 5 Feb 2012 11:41:01 +0000 (+0100)
Subject: Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_col... 
X-Git-Tag: sapier-20120207~3^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8929a47296b79bb8e29bd292c2474ecbaf54b9f1;p=oweals%2Fminetest.git

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

8929a47296b79bb8e29bd292c2474ecbaf54b9f1