From: sapier <sapier at gmx dot net>
Date: Sun, 5 Feb 2012 19:35:54 +0000 (+0100)
Subject: Merge branch 'object_object_collision' into sapier_experimental
X-Git-Tag: sapier-20120207~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=413afa77d0e168a0a652c7437cf8179a0569cb89;p=oweals%2Fminetest.git

Merge branch 'object_object_collision' into sapier_experimental
---

413afa77d0e168a0a652c7437cf8179a0569cb89