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

[git at icinga.org]

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

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Thu Oct 22 11:27:32 2009 +0200

Merge branch 'mhein/default' into cdoebler/default

Conflicts:
	objects/search/IcingaApiSearchColumnsIdo.php

---