Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  created tgz (facebook)
  Updated the Readme (and added the "Select how your app integrates with Facebook" section)

* master:
Merge remote branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add gnot plugin

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add ljpost.css
  added the tarball
  added livejournal plugin
  minor fixes

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rebuild tgz
  seems the subject isn't really required, contrary to the docs.
  inconsistent file extension
  some small improvements to ljpost
  descriptive text for qcomment settings
  ljpost typos

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  xml escape ljpost vars
  Add Thomas Willingham contributed alternate version

* master:
Merge remote branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  xmlify the login credentials - just in case

* master:
Merge remote branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  blockem: fix to work with changed 'display_item' hook

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  please use make to build packages
  realized I had tarred up the irc, then made changes without updating the tarball, so, just now I updated the tarball.
  returned ljpost to same as in friendica/friendica-addons rather than make it offer other sites, I am writing separate plugins for separate sites. I already have a dreamwidth one written, as can be seen in my repo. Can/maybe will write up insanejournal, deadjournal, blurty, etc. eventually, too
  for aesthetic reasons, reduced size of IRC chat window
  fixed irc chat...IT WORKS!
  tarred up irc
  removed mibbit, added simpler irc chat
  another minor alteration to mibbit
  again, just minor adjustment to mibbit
  minor alterations to mibbit.php
  added a mibbit/irc chatroom plugin
  minor adjustment to dwpost
  added dreamwidth connector
  working on adding support for other moveabletype sites. added entry for siteurl (lj_url)
  minor corrections, but still not working
  should work, doesn't. xml is correct, required parameters include, nothing gets through...
  the xml POST data was missing the "usejournal" parameter, required for LJ to know to which blog to post (since users have posting permission to their own AND to community blogs). It is now hardwired to their own, personal blog. Eventually this should be more configurable. Also, the plugin shouldn't be hardwired for livejournal, but also allow dreamwidth, insanejournal, deadjournal, etc. I'll work on that.

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Added tags support to LJ and DW connectors. (Friendica tags are converted to LJ/DW tags.)
  Bugfix
  Real-Time Updates
  Bugfix
  Support for FB Real-Time Updates according to http://developers.facebook.com/docs/reference/api/realtime/ . Plugin needs to be deactivated and activated again in order to enable the settings

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  adult_smile addon
  updating packages
  fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway)

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  minor
  replaces missing semi-colon...
  minor alteration
  another attempt having difficulties perhaps resolved?
  corrections, minor alterations
  minor alterations, mostly to ijpost
  added Cat's tag stuff to ijpost
  minor adjustment to ijpost.php
  cleaned up where "lj" was included in dwpost.css changed my profile url to the current, free-haven profile, in all plugins to which I have contributed added insanejournal.com plugin, ijpost other minor cleanup of details, where a plugin was copied and modified but incorrect details were left.
  facebook comment notifications
  Pages: Some minor improvements (I guess) :)
  Removed the test file
  Pages: Added pages.tgz
  Pages: New plugin that displays a list of community pages on the sidebar.
  added a link in the IRC page to the tldp.org Beginner's Guide to IRC.
  Facebook: Don't import empty messages

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  added comments and link to documentation to irc.php

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  not yet linked adult_smiles
  pkg update
  deleted:    smiley_pack/smiley_pack.php~
  First set of smilies for smiley_pack

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Fixed typo
  Fixed stuff
  Happy smileys
  Fixed typos per Fabian Dost bug report
  More irritating smileys to make everybody cross
  Fantasy smileys.  Alas, not the fantasty where nobody uses smileys.
  Suitable punishments for anyone who actually uses any of these smilies.
  Tired smileys
  actual smileys
  Stupid love smileys
  More retarded smileys
  bug: used uid for allow_gid instead of contact id

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  cleanup shaka emoticon
  Beard, Shaka, headbang, and whitebeard that somehow didn't get commited
  fix missing packages
  package updates
  This deactivated the plugin not only when uninstalling it, but also when updating it
  Music smileys
  misc new smileys
  Laughing smileys
  Banana smiley - may need to be removed if I can't verify licence
  respect smileys
  add frown plugin
  Delete the app_access_token once the addon is uninstalled. And some more error handling

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master: