Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Tue, 30 Aug 2016 18:27:35 +0000 (20:27 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Tue, 30 Aug 2016 18:27:35 +0000 (20:27 +0200)
commit1e02d4cd7119102c49e757c658dba33856a0542d
tree5e35cd48ff506fff8915c313b4fc3e43fe4566f0
parent63ed620017ceb53bd2b66c4d3e01bf2f24fc953f
parent6fb392947ba9790426c337014aa7f38a0b7530ad
Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation

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