quattor/quattor.github.com — pull request #92 by jouvin (2014-04-03 17:52:25+00:00)
Title: Web site doc: remove overlooked conflict

Hopefully #90 solved...