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

[tstclair]

commit 9fc22d5dbe32eb909c71525847c819c818079102
Merge: bcd7405 fe2ef0d
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Oct 10 09:15:31 2014 -0500

    Merge branch 'f21'

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