[mariadb-galera/f21: 2/2] Merge branch 'master' into f21

[Peter Robinson]

commit 6b9a437948ad5f681e9944bf421147a575e5a2b5
Merge: 82fb0a5 de8f4da
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Dec 4 15:45:36 2014 +0000

    Merge branch 'master' into f21

 mariadb-galera.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---