[icinga-checkins] icinga.org: icingaweb2/master: Merge branch 'master' into feature/ localization-form-6073

[git at icinga.org]

Module: icingaweb2
Branch: master
Commit: 2e24c5322412af176460cd09fe7dac9d29b4c10a
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=2e24c5322412af176460cd09fe7dac9d29b4c10a

Author: Alexander Fuhr <alexander.fuhr at netways.de>
Date:   Wed Nov  5 13:27:45 2014 +0100

Merge branch 'master' into feature/localization-form-6073

Conflicts:
	application/forms/Config/GeneralForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Web.php

---