[Pkg-nagios-changes] [icinga] 02/02: Merge tag 'upstream/1.11.1'

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository icinga.

commit 03c3082608ad9df4245f5a1b53f8bc0e2629d9b0
Merge: 0ceea06 a8a977f
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Mar 30 13:32:45 2014 +0200

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1

 Changelog                                          |   16 +
 Makefile.in                                        |    2 +-
 cgi/cgiutils.c                                     |    2 +-
 cgi/extinfo.c                                      |    8 +
 configure                                          |    4 +-
 configure.in                                       |    4 +-
 html/jquery-ui-addon/jquery.ui.timepicker-addon.js | 3675 ++++++++++++--------
 html/main.html                                     |    6 +-
 icinga.spec                                        |    9 +-
 include/common.h                                   |    4 +-
 include/statusdata.h                               |    1 +
 module/idoutils/db/pgsql/pgsql.sql                 |    4 +-
 module/idoutils/include/common.h                   |    4 +-
 module/idoutils/include/ido2db.h                   |    1 +
 module/idoutils/src/db.c                           |   80 +-
 module/idoutils/src/ido2db.c                       |    4 +-
 update-version                                     |    4 +-
 xdata/xsddefault.c                                 |    2 +
 18 files changed, 2270 insertions(+), 1560 deletions(-)

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