abarisain/dmix — pull request #269 by jcnoir (2013-10-20 14:56:21+00:00)
Title: New pull request with fixed history

I created a new branch to make a clean commit history with cherry-pick.
This is the new branch, I cannot fix the old one (#268)
The content should be the same ;-)