]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Wed, 4 Sep 2013 08:37:41 +0000 (01:37 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 4 Sep 2013 08:37:41 +0000 (01:37 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge