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

[Kaleb S. KEITHLEY]

commit fad03be8dd24e63876613178bc12266aa0e349f1
Merge: 224f3fe 5bd720e
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Apr 23 08:41:42 2014 -0400

    Merge remote-tracking branch 'origin' into f19

 glusterfs.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---