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

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Thu Feb 14 23:53:50 2013 +0100

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

---