From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Tue, 30 Aug 2016 18:27:35 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
X-Git-Tag: weatherinformation-1.2~1
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=1e02d4cd7119102c49e757c658dba33856a0542d;p=AndroidWeatherInformation

Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation

Conflicts:
	app/src/main/java/name/gumartinm/weather/information/httpclient/CustomHTTPClient.java
---

1e02d4cd7119102c49e757c658dba33856a0542d