ceph/calamari — pull request #157 by GregMeno (2014-07-07 15:32:49+00:00)
Title: Master 1.2 merge gmeno

@jcsp
@dmick

The only conflicts were in README.rst
and building_packages.rst
I chose to take master as authoritative in both cases.