[munin/el5: 4/4] Merge remote-tracking branch 'origin/master' into el5

[fenris02]

commit 509734eaba50aa4ec960cedb8701b445526c0061
Merge: 320da9d b8fb6c5
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Fri Mar 6 23:36:08 2015 -0600

    Merge remote-tracking branch 'origin/master' into el5

 274.patch                 | 32 ++++++++++++++++++++++++++++++
 bz1049262-ntp_.patch      | 29 +++++++++++++++++++++++++++
 mariadb-innodb.patch      | 45 ++++++++++++++++++++++++++++++++++++++++++
 mariadb-show-status.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 munin-1.4.5-df-config     |  2 +-
 munin.spec                | 16 ++++++++++++++-
 6 files changed, 172 insertions(+), 2 deletions(-)
---