Merge branch '1.2' into 1.3

Conflicts:
    widgets/base.py

Author: staverne

OPML/rssfeeds.py

@@ -436,7 +436,7 @@ def to_opml_stream(self, context):
         namespace = {}
         namespace['title'] = self.get_property('title')
         namespace['mtime'] = HTTPDate.encode(self.get_mtime())
-        revisions = self.get_revisions(context)
+        revisions = self.get_revisions()
         name = email = None
         if revisions:
             root = context.root

tags/tags_views.py

@@ -155,8 +155,7 @@ def get_namespace(self, resource, context):
 
         # query
         root = context.root
-        tags_query = tags_folder.get_tags_query_terms(state='public',
-                                                      formats=self.formats)
+        tags_query = tags_folder.get_tags_query_terms(formats=self.formats)
         tags_results = root.search(AndQuery(*tags_query))
 
         items_nb = []