yanhick/Cocktail — pull request #21 by codam (2012-05-11 14:13:41+00:00)
Title: Develop

2nd merge try