]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/stable' into next
authorSage Weil <sage@inktank.com>
Thu, 21 Jun 2012 15:20:17 +0000 (08:20 -0700)
committerSage Weil <sage@inktank.com>
Thu, 21 Jun 2012 15:20:17 +0000 (08:20 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge