]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Tue, 23 Jul 2013 06:19:47 +0000 (23:19 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 23 Jul 2013 06:19:47 +0000 (23:19 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge