Merge branch 'torsten/local-weather'
authorTim Moore <timoore33@gmail.com>
Thu, 6 May 2010 09:05:24 +0000 (11:05 +0200)
committerTim Moore <timoore33@gmail.com>
Thu, 6 May 2010 09:05:24 +0000 (11:05 +0200)
commite7d58a2023efd084d4ca61d6e04c676d6507e6a3
tree8ea61fc24f0cc29a733597887d83c3bdef943dd0
parent26e04d907266831c8117b4eba7ebc0289aab08a5
parentd356f737859a11ac6652b4fca61dd7ac223aee81
Merge branch 'torsten/local-weather'