[mariadb-galera/f20: 9/9] Merge branch 'master' into f20

[Honza Horak]

commit bb3e4024992e882e82e8bc9ae51a645919b59c0a
Merge: 137a462 e964730
Author: Honza Horak <horak.honza at gmail.com>
Date:   Wed Jul 30 23:49:08 2014 +0200

    Merge branch 'master' into f20

 .gitignore          |    1 +
 mariadb-galera.spec |   17 +++++++++--------
 sources             |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
---