From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 11 Jul 2015 12:58:49 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=745cd614e263f6c94fa628e86fc3f330faf6ae6a;p=blog.git

Merge branch 'master' into develop
---

745cd614e263f6c94fa628e86fc3f330faf6ae6a