[MySQL-zrm/epel7: 3/3] Merge branch 'master' into epel7

[Orion Poplawski]

commit 74830d03a3e93098fcbc222cef97e37355dbb77a
Merge: 715bce5 1cebb7f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Jul 23 09:15:22 2014 -0600

    Merge branch 'master' into epel7

 ...-zrm-2.2.0-quiet.patch => MySQL-zrm-quiet.patch |   22 ++++++++--------
 MySQL-zrm.spec                                     |   26 ++++++++++++++++----
 2 files changed, 32 insertions(+), 16 deletions(-)
---