[glusterfs/f19: 2/2] Merge branch 'master' into f19

[Niels de Vos]

commit 178771a24664c254645b032b7e0fb7ffb68f6e01
Merge: e5a6c58 b609dc6
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Wed Dec 25 15:59:41 2013 +0100

    Merge branch 'master' into f19

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