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

[Lalatendu Mohanty]

commit b2b6e30fb3f2bf9d714ca3185d1490971177ccf1
Merge: c047006 552921b
Author: Lalatendu Mohanty <lmohanty at redhat.com>
Date:   Tue Jun 24 20:26:04 2014 +0530

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

 glusterfs.spec |   11 +++++++----
 sources        |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---