From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 26 Sep 2011 08:57:28 +0000 (+0300)
Subject: Merge remote-tracking branch 'darkrose/master'
X-Git-Tag: 0.3.dev-20111021~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817;p=oweals%2Fminetest.git

Merge remote-tracking branch 'darkrose/master'
---

0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817