From f01c5c1e3ea4a1c6060f87e6883062c25f8b13aa Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 17:23:34 -0300
Subject: [PATCH] Merge branches 'master' and 'bug/3838' into bug/3838

-- 
GitLab