[icinga-checkins] icinga.org: icinga-web/master: Merge branch 'master' of git.icinga.org: icinga-web

[git at icinga.org]

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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Dec 13 09:47:32 2011 +0100

Merge branch 'master' of git.icinga.org:icinga-web

---