]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-makefile'
authorSage Weil <sage.weil@dreamhost.com>
Thu, 12 Jan 2012 18:35:03 +0000 (10:35 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 12 Jan 2012 18:35:03 +0000 (10:35 -0800)

Trivial merge