From ae87878e14b5c65e2de06002269a12fe0b492b10 Mon Sep 17 00:00:00 2001
From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 20 May 2012 22:48:40 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'

-- 
2.47.3