[mesos/f21: 2/2] Merge branch 'f20' into f21

[tstclair]

commit 11e1d207c9d50e3dadbc0981f3b581911143d99b
Merge: 9177f13 4de4f48
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Oct 23 14:53:39 2014 -0500

    Merge branch 'f20' into f21

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