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

[git version control]

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Dec 23 17:56:11 2011 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Dec 23 17:56:11 2011 +0100

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

---