randybb/CMDB — pull request #1 by randybb (2014-09-14 21:28:50+00:00)
Title: manual merge

I don't know why I have to do it manually :(