[glusterfs/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Kaleb S. KEITHLEY]

commit 29930e5cb143718acc0406620c12238a6efa53d3
Merge: f2fb34e 579af0d
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jul 12 15:00:07 2013 -0400

    Merge remote-tracking branch 'origin/master' into el6
    
    GlusterFS 3.4.0 GA, glusterfs-3.4.0-1

 glusterfs.spec |   13 ++++++-------
 sources        |    4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)
---