Merge branch 'torsten/local-weather' into next
authorTim Moore <timoore33@gmail.com>
Mon, 19 Apr 2010 08:08:58 +0000 (10:08 +0200)
committerTim Moore <timoore33@gmail.com>
Mon, 19 Apr 2010 08:08:58 +0000 (10:08 +0200)
commit6e11c83c0a838ec8ac3a4dc01d4fabffb6079c8d
tree54e00127b0bee0cafc94b046480c30304b456499
parent04475812556f7abdaa7620d61dcff63a46a817ea
parentd356f737859a11ac6652b4fca61dd7ac223aee81
Merge branch 'torsten/local-weather' into next