[glusterfs/kk-el6: 2/2] Merge branch 'master' into kk-el6

[Niels de Vos]

commit 6d3f7e926f2c97a79a08abc6d404b6632246ca7d
Merge: 577154b b609dc6
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Wed Dec 25 15:59:41 2013 +0100

    Merge branch 'master' into kk-el6

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---