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

[Lalatendu Mohanty]

commit 92abe45a9ec812f82434380d93c46918c6f7b7e1
Merge: 1bca672 117ae4f
Author: Lalatendu Mohanty <lmohanty at redhat.com>
Date:   Tue Jul 22 08:28:52 2014 +0530

    Merge remote-tracking branch 'origin' into f19

 glusterd.init  |    2 +-
 glusterfs.spec |   22 ++++++++++++++++++----
 sources        |    2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
---