Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 16 Nov 2014 17:09:32 +0000 (18:09 +0100)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 16 Nov 2014 17:09:32 +0000 (18:09 +0100)

Trivial merge