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

[tstclair]

commit 4fffe51c2d14422cc81a42d45b07f1fa73a3f54c
Merge: a075856 11e1d20
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Oct 23 14:53:48 2014 -0500

    Merge branch 'f21'

 mesos.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---