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

[Jan Staněk]

commit 8d049201c0a71d99d855cf992d92d55636d001df
Merge: c769efa a2a92b8
Author: Jan Staněk <jstanek at redhat.com>
Date:   Fri Oct 24 14:22:30 2014 +0200

    Merge branch 'master' into f21

 mariadb.spec            |    6 +++++-
 mysql-compat.service.in |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
---