[glusterfs/kk-el6: 5/5] Merge branch 'f21' into kk-el6

[Lalatendu Mohanty]

commit f0aaf348e531213521dea175d9fdfd1fbe4b1d41
Merge: 4ff2d80 f8701d4
Author: Lalatendu Mohanty <lmohanty at redhat.com>
Date:   Thu Nov 20 00:53:57 2014 +0530

    Merge branch 'f21' into kk-el6

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