Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Wed, 11 Dec 2013 22:31:48 +0000 (22:31 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 11 Dec 2013 22:31:48 +0000 (22:31 +0000)
1  2 
configure

diff --cc configure
Simple merge