[Pkg-nagios-changes] [pkg-icinga2] 02/02: Merge branch 'master' of alioth.debian.org:/git/pkg-nagios/pkg-icinga2

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit 02e8b440115a7f1ba554aec15ff8ef86b8f9ec3f
Merge: 09024ca b4f5917
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Thu Feb 4 13:28:31 2016 +0100

    Merge branch 'master' of alioth.debian.org:/git/pkg-nagios/pkg-icinga2

 debian/.gitignore                |  1 +
 debian/control                   | 14 +++++++++++++-
 debian/icinga2-common.install    |  2 +-
 debian/rules                     | 12 +++++++-----
 debian/vim-icinga2.README.Debian | 13 +++++++++++++
 debian/vim-icinga2.install       |  3 +++
 debian/vim-icinga2.yaml          |  5 +++++
 7 files changed, 43 insertions(+), 7 deletions(-)

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