michaelkrieg/zendserverpuppet-vagrant — pull request #2 by michaelkrieg (2014-09-24 12:37:41+00:00)
Title: back-merge

from now on we're doing the development in the main, the "dev" branch.