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

[Honza Horak]

commit fe1e604239bafed2731d55918df25c1bad117fb2
Merge: ef58175 8a5dc2e
Author: Honza Horak <hhorak at redhat.com>
Date:   Thu Dec 18 16:49:41 2014 +0100

    Merge branch 'master' into f21

 .gitignore                                |    1 +
 mariadb-10.0.14-mysql_config-cflags.patch |   20 ----
 mariadb-cipherspec.patch                  |  115 ----------------------
 mariadb-covscan-signexpr.patch            |    8 +-
 mariadb-covscan-stroverflow.patch         |   13 ++-
 mariadb-dh1024.patch                      |    8 +-
 mariadb-scripts.patch                     |   18 ++--
 mariadb-ssltest.patch                     |   16 ++--
 mariadb-strmov.patch                      |    8 +-
 mariadb.spec                              |  147 ++++++++++-------------------
 rh-skipped-tests-arm.list                 |    5 +-
 rh-skipped-tests-base.list                |    4 +
 sources                                   |    2 +-
 13 files changed, 91 insertions(+), 274 deletions(-)
---