]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable' into next
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jul 2012 17:16:07 +0000 (10:16 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jul 2012 17:16:07 +0000 (10:16 -0700)

Trivial merge