Merge branch 'configurator' into gnome3.2

Conflicts:
	weather-extension-configurator.py
yahoo_weather
simon04 13 years ago
commit 8d6b2dfec6
Loading…
Cancel
Save