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

[tstclair]

commit a075856815763d85f7e98eee6054cc58fb26540c
Merge: 60dcd9b 9177f13
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Oct 23 14:45:09 2014 -0500

    Merge branch 'f21'

 mesos.spec |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---