From 3b709c9cfd1252c360978fdf44f1d825279682db Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 16:48:51 -0300
Subject: [PATCH] Merge branches 'master' and 'bug/3721' into bug/3721

-- 
GitLab