Merge branch 'master' of https://git.maemo.org/projects/feedingit

diff --cc src/FeedingIt.py
Simple merge

diff --cc src/config.py
index 5c98ec0,251c868..791f6e9
--- 1/src/config.py
--- 2/src/config.py
+++ b/src/config.py
@@@ -114,9 -138,15 +138,15 @@@ class Config()
          bus = dbus.SessionBus()
          proxy = bus.get_object("com.nokia.osso_browser", "/com/nokia/osso_browser/request")
          iface = dbus.Interface(proxy, 'com.nokia.osso_browser')
 -        iface.open_new_window("http://feedingit.marcoz.org/%s.html" % VERSION)
 +        iface.open_new_window("http://feedingit.marcoz.org/news/?page_id=%s" % VERSION)
  
      def onExit(self, *widget):
+         # When the dialog is closed without hitting
+         # the "Save" button, restore the configuration
+         if self.do_restore_backup:
+             print 'Restoring configuration'
+             self.config = self.config_backup
+ 
          self.saveConfig()
          self.window.destroy()