Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Tue, 3 Feb 2015 14:52:07 +0000 (06:52 -0800)
committerSage Weil <sage@redhat.com>
Tue, 3 Feb 2015 14:52:07 +0000 (06:52 -0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge