[collectd/f21: 17/17] Merge branch 'master' into f21

[Ruben Kerkhof]

commit e6df062ba68cb4bd9d73f6f3b1801b618288eff1
Merge: 041c14f b13f0f6
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Fri Feb 27 14:07:42 2015 +0100

    Merge branch 'master' into f21

 .gitignore                                         |   1 +
 collectd-fix-colors-in-collection.conf.patch       |  63 ---
 ...lvm-do-not-segfault-when-there-are-no-vgs.patch |  28 --
 collectd-support-varnish-4.patch                   | 556 +++++++++++++++++++++
 collectd.service                                   |  13 +-
 collectd.spec                                      |  59 ++-
 sources                                            |   2 +-
 7 files changed, 612 insertions(+), 110 deletions(-)
---