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

[git at icinga.org]

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

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Tue Jan  5 20:55:05 2010 +0100

Merge branch 'master' of git at git.icinga.org:icinga-doc

---