From: cbrutail <ruszkai.akos@gmail.com>
Date: Sat, 22 Jan 2011 20:16:30 +0000 (+0100)
Subject: Merge branch 'cbrutail/effects-beams' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc7463db72f13bd43eb2afed401eec334a4ed34a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/effects-beams' into cbrutail/map-fanatic
---

bc7463db72f13bd43eb2afed401eec334a4ed34a