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

Browse Source

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

* master:

pull/43/head

Simon L'nu 2012-02-27 00:56:57 -05:00

parent 4812cae412

commit 57295cffa0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available