[icinga-checkins] icinga.org: icinga-web/next: Merge branch 'mfrosch/apacheconfig' into next

[git at icinga.org]

Module: icinga-web
Branch: next
Commit: 4d186634c8914a91540ff590af4f62fb8852a30f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=4d186634c8914a91540ff590af4f62fb8852a30f

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Feb 12 16:17:49 2013 +0100

Merge branch 'mfrosch/apacheconfig' into next

---