Merge remote branch 'upstream/master'

diff --cc dwpost/dwpost.php
index bb4557269a6f458a644466d8f6ae83565d7fc114,5f8dcc733ae6f531f1844529c0012bea7df63835..85e808c0d7b6d9f3956f7bedfcb63b37148af709
--- 1/dwpost/dwpost.php
--- 2/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@@ -4,8 -4,9 +4,9 @@@
   * Name: Dreamwidth Post Connector
   * Description: Post to dreamwidth
   * Version: 1.0
 - * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
 + * Author: Tony Baldwin <https://free-haven.org/profile/tony>
   * Author: Michael Johnston
+  * Author: Cat Gray <https://free-haven.org/profile/catness>
   */
  
  function dwpost_install() {

diff --cc ljpost/ljpost.php
index 14bac69e3a81cffd80380a19b6f5ae6c8872ce65,e1bd2d630e28beb0e2c56acbbc71316b9cd0b2c8..ddcd28907f1fe5ec3a4aa2c3f204f2b2d508f21c
mode 100644,100755..100755
--- 1/ljpost/ljpost.php
--- 2/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@@ -4,8 -4,9 +4,9 @@@
   * Name: LiveJournal Post Connector
   * Description: Post to LiveJournal
   * Version: 1.0
 - * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
 + * Author: Tony Baldwin <https://free-haven.org/profile/tony>
   * Author: Michael Johnston
+  * Author: Cat Gray <https://free-haven.org/profile/catness>
   */
  
  function ljpost_install() {