Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 13:40:03 +0000 (15:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 13:40:03 +0000 (15:40 +0200)
commite16769afc48942cb2e9323f0e86b090959bf36b7
tree2affd4c629d51a4c68ec9a4fcbd3a1c2c989e424
parentb14c545d2699e29ef2b6261c6215ff6cff8afb8f
parent049a3349de147807768f5b6e89a53c09c5249282
Merge branch 'master' into divVerent/crypto2

Conflicts:
qcsrc/server/ipban.qc
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc
qcsrc/server/ipban.qc