Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent...
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000 (19:50 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000 (19:50 +0200)

Trivial merge