From 7acf501ffa453bccfd4c7be136da1a42817599be Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 30 Apr 2012 16:25:14 -0400
Subject: [PATCH] Merge branches 'master' and 'master' of
 git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

-- 
GitLab