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

[git version control]

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 13 11:18:46 2016 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 13 11:18:46 2016 +0200

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

---