Merge branch 'master' of https://github.com/mono/mono
authorAlexis Christoforides <alexis@thenull.net>
Wed, 23 Apr 2014 18:44:48 +0000 (14:44 -0400)
committerAlexis Christoforides <alexis@thenull.net>
Wed, 23 Apr 2014 18:44:48 +0000 (14:44 -0400)
1  2 
configure.in

diff --cc configure.in
Simple merge