]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Wed, 21 Mar 2012 13:28:15 +0000 (06:28 -0700)
committerSage Weil <sage@newdream.net>
Wed, 21 Mar 2012 13:28:15 +0000 (06:28 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge