[ceph/el6: 2/2] Merge remote-tracking branch 'origin' into el6

[Kaleb S. KEITHLEY]

commit 38d866465a7fa8b3ce31cee516c8ad640c513b79
Merge: 4e33e00 c28233e
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed May 14 10:57:43 2014 -0400

    Merge remote-tracking branch 'origin' into el6

 .gitignore |   21 ++-------------------
 ceph.spec  |   12 +++++++++++-
 2 files changed, 13 insertions(+), 20 deletions(-)
---