Merge remote-tracking branch 'origin/windows'
authorLuke Howard <lukeh@padl.com>
Wed, 14 Sep 2011 06:12:34 +0000 (16:12 +1000)
committerLuke Howard <lukeh@padl.com>
Wed, 14 Sep 2011 06:12:34 +0000 (16:12 +1000)
1  2 
configure.ac

diff --cc configure.ac
Simple merge