[omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd

[git version control]

Module:   omd
Branch:   master
Commit:   ffd6c22dc06c361f211af8fc0a2038b3ad3f41b2
URL:      http://omdistro.org/projects/omd/repository/revisions/ffd6c22dc06c361f211af8fc0a2038b3ad3f41b2

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Sat May  7 09:26:14 2011 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Sat May  7 09:26:14 2011 +0200

Merge branch 'master' of mathias-kettner.de:omd

---