[Pkg-nagios-changes] [pkg-pnp4nagios] 01/01: Merge branch 'upstream' into upstream_dfsg

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch upstream_dfsg
in repository pkg-pnp4nagios.

commit d59c5abc8bf38871e0f22f9659d66edfae99cf96
Merge: b920288 f1da1c3
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Dec 1 14:40:47 2015 +0100

    Merge branch 'upstream' into upstream_dfsg

 ChangeLog                                          |   10 +-
 configure                                          |   22 +-
 configure.ac                                       |    6 +-
 scripts/check_pnp_rrds.pl.in                       |    2 +-
 scripts/process_perfdata.pl.in                     |    4 +-
 scripts/rrd_convert.pl.in                          |    2 +-
 scripts/rrd_modify.pl.in                           |    2 +-
 share/pnp/application/controllers/graph.php        |    2 +-
 share/pnp/application/controllers/system.php       |    6 +-
 share/pnp/application/controllers/zoom.php         |    2 +-
 share/pnp/application/helpers/pnp.php              |    2 +
 share/pnp/application/models/data.php              |    2 +-
 share/pnp/application/vendor/fpdf/font/courier.php |   15 +-
 .../pnp/application/vendor/fpdf/font/courierb.php  |    8 +
 .../pnp/application/vendor/fpdf/font/courierbi.php |    8 +
 .../pnp/application/vendor/fpdf/font/courieri.php  |    8 +
 .../pnp/application/vendor/fpdf/font/helvetica.php |   34 +-
 .../application/vendor/fpdf/font/helveticab.php    |   34 +-
 .../application/vendor/fpdf/font/helveticabi.php   |   34 +-
 .../application/vendor/fpdf/font/helveticai.php    |   34 +-
 share/pnp/application/vendor/fpdf/font/symbol.php  |   34 +-
 share/pnp/application/vendor/fpdf/font/times.php   |   34 +-
 share/pnp/application/vendor/fpdf/font/timesb.php  |   34 +-
 share/pnp/application/vendor/fpdf/font/timesbi.php |   34 +-
 share/pnp/application/vendor/fpdf/font/timesi.php  |   34 +-
 .../application/vendor/fpdf/font/zapfdingbats.php  |   34 +-
 share/pnp/application/vendor/fpdf/fpdf.php         | 3536 ++++++++++----------
 share/pnp/application/views/zoom.php               |    1 +
 share/pnp/documents/de_DE/about.html               |   14 +-
 share/pnp/documents/de_DE/doc_complete.html        |    4 +-
 share/pnp/documents/de_DE/perfdata_format.html     |    2 +-
 share/pnp/documents/en_US/about.html               |   16 +-
 share/pnp/documents/en_US/doc_complete.html        |   18 +-
 share/pnp/documents/en_US/dwnld.html               |   27 +-
 share/pnp/documents/en_US/perfdata_format.html     |    2 +-
 share/pnp/media/images/pnp.png                     |  Bin 272 -> 273 bytes
 share/pnp/templates.dist/check_mssql_health.php    |   12 +-
 37 files changed, 2123 insertions(+), 1950 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-pnp4nagios.git