From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Fri, 7 Aug 2015 15:17:42 +0000 (+0200)
Subject: Merge branch 'provider-proxy', remote branch 'origin'
X-Git-Tag: v4.18.6~2
X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=c1d6396ac004614ad08c4f52858359b256502f76;hp=7267989c70313d31af67a8827f4ab020456e5f6d;p=brisk.git

Merge branch 'provider-proxy', remote branch 'origin'
---