Merge pull request #5385 from dachary/wip-12501-hammer

author Loic Dachary <loic@dachary.org>

Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)

committer Loic Dachary <loic@dachary.org>

Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)
author Loic Dachary <loic@dachary.org>
Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)
committer Loic Dachary <loic@dachary.org>
Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Loic Dachary <loic@dachary.org>
	Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)
committer	Loic Dachary <loic@dachary.org>
	Sun, 30 Aug 2015 11:38:43 +0000 (13:38 +0200)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history