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

[Jan Staněk]

commit ef581753262a3d5fbeff82b09c1b52118dbf101a
Merge: 8d04920 c0c6368
Author: Jan Staněk <jstanek at redhat.com>
Date:   Thu Nov 20 14:10:58 2014 +0100

    Merge branch 'master' into f21

 mariadb-10.0.14-mysql_config-cflags.patch |   20 ++++++++++++++++++++
 mariadb.spec                              |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---