From 57295cffa0af8b68f820d6b93074b347f692975c Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 00:56:57 -0500
Subject: [PATCH] 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: