[icinga-checkins] icinga.org: icinga-api/mhein/default: Merge branch 'master' of git.icinga. org:icinga-api into mhein/default

[git at icinga.org]

Module: icinga-api
Branch: mhein/default
Commit: 233407b7c45c9297c51355e7626ef6853cb035a5
URL:    https://git.icinga.org/?p=icinga-api.git;a=commit;h=233407b7c45c9297c51355e7626ef6853cb035a5

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 19 11:15:23 2010 +0200

Merge branch 'master' of git.icinga.org:icinga-api into mhein/default

---