[community-mysql/f21: 2/2] Merge branch 'master' into f21

[Honza Horak]

commit 6195b811e0ca9954185b45d36c2d3a4ad492d4f2
Merge: cabe357 e29bd9d
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Oct 13 20:57:25 2014 +0200

    Merge branch 'master' into f21

 community-mysql.spec |    5 ++++-
 mysql.service.in     |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)
---