[mesos: 6/6] Merge branch 'f21'

[tstclair]

commit 60dcd9b16fcfc319776fd2ec0bc4388ea1426fb1
Merge: 9fc22d5 f3f2a2a
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Oct 22 14:39:07 2014 -0500

    Merge branch 'f21'

 .gitignore |    1 +
 mesos.spec |   20 ++++++++++++++++----
 sources    |    2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)
---