[Pkg-nagios-changes] [pkg-icingaweb2] 02/03: Merge tag 'upstream/2.1.2'

[Markus Frosch]

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

lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.

commit 73c0784504106830527cf5a783226d6b2a296aca
Merge: a488312 6abcf98
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Dec 23 15:13:17 2015 +0100

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2
    
    # gpg: Signature made Wed Dec 23 15:13:13 2015 CET using RSA key ID AB987B6E
    # gpg: Good signature from "Markus Frosch <markus at lazyfrosch.de>"
    # gpg:                 aka "Markus Frosch (Icinga) <lazyfrosch at icinga.org>"
    # gpg:                 aka "Markus Frosch (NETWAYS) <markus.frosch at netways.de>"
    # gpg:                 aka "Markus Frosch (Debian) <lazyfrosch at debian.org>"

 VERSION                                                  |  2 +-
 application/VERSION                                      |  2 +-
 application/forms/Config/General/ThemingConfigForm.php   |  2 +-
 doc/installation.md                                      |  8 ++------
 icingaweb2.spec                                          |  2 +-
 library/Icinga/Application/Version.php                   |  2 +-
 modules/doc/module.info                                  |  2 +-
 modules/iframe/module.info                               |  2 +-
 modules/monitoring/module.info                           |  2 +-
 modules/setup/application/forms/AuthBackendPage.php      | 15 +++++++++++++++
 modules/setup/application/forms/UserGroupBackendPage.php | 15 +++++++++++++++
 modules/setup/module.info                                |  2 +-
 modules/test/module.info                                 |  2 +-
 modules/translation/module.info                          |  2 +-
 14 files changed, 43 insertions(+), 17 deletions(-)

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