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

[Lalatendu Mohanty]

commit 7c62c103a6277b0373fac4b40939eebeae2ef10d
Merge: fcdba08 1474004
Author: Lalatendu Mohanty <lmohanty at redhat.com>
Date:   Fri Aug 1 00:09:24 2014 +0530

    Merge remote-tracking branch 'origin' into kk-el6

 glusterfs.spec |    7 +++++--
 sources        |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---