Merge from trunk

src/calibre/gui2/preferences/create_custom_column.ui

@@ -126,8 +126,7 @@ Everything else will show nothing.</string>
             <string>Contains names</string>
            </property>
            <property name="toolTip">
-            <string>Check this box if the field contains names that are
-to be separated by ampersands instead of commas.</string>
+            <string>Check this box if this column contains names, like the authors column.</string>
            </property>
           </widget>
          </item>

src/calibre/library/server/browse.py

@@ -15,7 +15,7 @@ from calibre import isbytestring, force_unicode, fit_image, \
         prepare_string_for_xml
 from calibre.utils.ordered_dict import OrderedDict
 from calibre.utils.filenames import ascii_filename
-from calibre.utils.config import prefs, tweaks
+from calibre.utils.config import prefs
 from calibre.utils.icu import sort_key
 from calibre.utils.magick import Image
 from calibre.library.comments import comments_to_html

src/calibre/library/server/opds.py

@@ -22,7 +22,6 @@ from calibre.library.server.utils import format_tag_string, Offsets
 from calibre import guess_type, prepare_string_for_xml as xml
 from calibre.utils.icu import sort_key
 from calibre.utils.ordered_dict import OrderedDict
-from calibre.utils.config import tweaks
 
 BASE_HREFS = {
         0 : '/stanza',