Merge branch '0.7.x' into 0.8.x

diff --combined README
index dcd5f6a953efc748769822d1b15d0ee64e4ab907,09d9d301c5b04e65eaa2b09e867782f8aa3a0e37..29a1e157ad044730a2e5b674f1c41c4b4a2fa984
--- 1/README
--- 2/README
+++ b/README
@@@ -176,10 -176,6 +176,10 @@@ and the URLs are listed here for your c
    version may render your Laconica site unable to send or receive XMPP
    messages.
  - Facebook library. Used for the Facebook application.
 +- PEAR Services_oEmbed. Used for some multimedia integration.
 +- PEAR HTTP_Request is an oEmbed dependency.
 +- PEAR Validat is an oEmbed dependency.e
 +- PEAR Net_URL is an oEmbed dependency.2
  
  A design goal of Laconica is that the basic Web functionality should
  work on even the most restrictive commercial hosting services.
@@@ -1129,7 -1125,7 +1129,7 @@@ default: nickname of a user account to 
           service updates or announcements. Users are able to unsub
           if they want. Default is null; no auto subscribe.
  welcome: nickname of a user account that sends welcome messages to new
-          users. Can be the same as 'subscribe' account, although on
+          users. Can be the same as 'default' account, although on
           busy servers it may be a good idea to keep that one just for
           'urgent' messages. Default is null; no message.