From: nyov <nyov@nexnode.net>
Date: Sun, 6 May 2012 02:17:24 +0000 (+0200)
Subject: clean dangling commit on actually merged branch
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonstat.git;a=commitdiff_plain;h=57e5611fe7a40c3ff52f1a6eb227f0553841f1b7

clean dangling commit on actually merged branch

Merge remote-tracking branch 'dmazary/patch-3'
---

57e5611fe7a40c3ff52f1a6eb227f0553841f1b7