]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Sat, 5 Oct 2013 02:11:36 +0000 (02:11 +0000)
committerGary Lowell <gary.lowell@inktank.com>
Sat, 5 Oct 2013 02:11:36 +0000 (02:11 +0000)
1  2 
configure.ac

diff --cc configure.ac
Simple merge