Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)
committerunknown <samual@xonotic.org>
Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)
1  2 
effectinfo.txt

diff --cc effectinfo.txt
Simple merge