]> gitweb.fluxo.info Git - blog.git/commitdiff
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 11 Jul 2015 12:58:49 +0000 (09:58 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 11 Jul 2015 12:58:49 +0000 (09:58 -0300)

Trivial merge