[icinga-checkins] icinga.org: icinga-doc/master: Merge branches 'master' and 'docu-de'

[git at icinga.org]

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

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Wed Oct 14 16:14:53 2009 +0200

Merge branches 'master' and 'docu-de'

---