jaunesarmiento/fries — pull request #94 by eyecatchup (2014-03-12 20:05:24+00:00)
Title: Clean wip/v2.1.0 branch

Resolved conflicts and merged everything into a new branch. These branches can be automatically merged now. :)