Merge branch 'master' into v4.8.x
authorArun Persaud <arun@nubati.net>
Thu, 16 Oct 2014 03:50:51 +0000 (20:50 -0700)
committerArun Persaud <arun@nubati.net>
Thu, 16 Oct 2014 03:50:51 +0000 (20:50 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge