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

[tstclair]

commit 6a8d5f02fd1880057981e5e841ec669cafeb3071
Merge: a9ea624 d34422e
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Tue Oct 21 16:07:58 2014 -0500

    Merge branch 'f20' into f21

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