Merge branch 'master' of win:c:/m64/head/.
authorIan Lynagh <igloo@earth.li>
Thu, 15 Mar 2012 18:14:40 +0000 (18:14 +0000)
committerIan Lynagh <igloo@earth.li>
Thu, 15 Mar 2012 18:14:40 +0000 (18:14 +0000)
1  2 
configure.ac

diff --cc configure.ac
Simple merge