Bowbaq/pierre-merge — pull request #5 by Bowbaq (2014-09-06 17:26:12+00:00)
Title: Revert "master > one"

Reverts Bowbaq/pierre-merge#1