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 1/2] 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:

From 4d12c1abe6d6b43e204d9a387ba9d7cf1316a815 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 11 Apr 2012 02:04:31 -0400
Subject: [PATCH 2/2] re-do piwik css a bit

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 piwik/piwik.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwik/piwik.css b/piwik/piwik.css
index e5e95bbe..066413de 100755
--- a/piwik/piwik.css
+++ b/piwik/piwik.css
@@ -1,9 +1,9 @@
 #piwik-optout-link {
-	padding: 100px 50px;
+	padding: 50px 0 0 0;
 	text-align: justify;
 	font-size: 0.85em;
-        margin-top:10px;
-        clear: both;
+    margin-top:10px;
+    clear: both;
 }
 #piwik-code-block {
 	display: none;