Merge commit 'd6e74'
authorLucas Teixeira <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:44:09 +0000 (19:44 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:44:09 +0000 (19:44 -0300)

Trivial merge