Merge commit '7b4c329'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:26 +0000 (00:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:26 +0000 (00:43 +0100)
1  2 
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/t_items.qc

Simple merge