From f842c90007631c7f9d1a424e05c0543c50bb95c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Wed, 19 Oct 2011 06:57:39 -0200
Subject: [PATCH] Merge branches 'master' and 'fixes-325' into fixes-325