[glusterfs/f19: 1/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/glusterfs into f19

[Kaleb S. KEITHLEY]

commit afda5e1a76da69d71707d824fe1e57c6d504f213
Merge: 7f0a4c4 a9739ec
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Oct 28 06:49:55 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/glusterfs into f19

 glusterfs-3.4.1.add.base-port.config.option.patch |  156 +++++++++++++++++++++
 glusterfs.spec                                    |   20 +++-
 glusterfsd.service                                |   14 ++-
 3 files changed, 182 insertions(+), 8 deletions(-)
---