Merge branch 'master' of ssh://push.git.xonotic.org/d0_blind_id
authorRudolf Polzer <divverent@xonotic.org>
Thu, 18 Jul 2013 16:16:54 +0000 (18:16 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 18 Jul 2013 16:16:54 +0000 (18:16 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge