From c1d6396ac004614ad08c4f52858359b256502f76 Mon Sep 17 00:00:00 2001
From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Fri, 7 Aug 2015 17:17:42 +0200
Subject: [PATCH] Merge branch 'provider-proxy', remote branch 'origin'

-- 
2.47.3