Normation/rudder — pull request #348 by Kegeruneku (2013-10-15 12:19:27+00:00)
Title: Fixes #4074: Fix the Apache vhost after a merge failure

Ticket: http://www.rudder-project.org/redmine/issues/4074

To be merged in master