Merge branch 'provider-proxy', remote branch 'origin'
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Fri, 7 Aug 2015 15:17:42 +0000 (17:17 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Fri, 7 Aug 2015 15:17:42 +0000 (17:17 +0200)
commitc1d6396ac004614ad08c4f52858359b256502f76
treea200b05f43ede49caf93c35c1ce33272816f2410
parent7267989c70313d31af67a8827f4ab020456e5f6d
Merge branch 'provider-proxy', remote branch 'origin'