From 36d173ca98f8f95bb14e58562004cdcf07c47183 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 00:56:41 -0500
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master: (29 commits)
  spam db
  fix tag icon size
  typo in css
  tagging missing from wallwall and a couple of themes, star missing from dispy
  Mail: New options for actions after importing mails.
  relative link redirects
  Avoid some notices
  Bugfix
  is not always defined; but if defined, then always of type integer
  1 Bugfix (missing $ character) and avoid some notices
  necessare fields not loaded from DB
  should probably be a->user['hidewall'] instead of profile['hidewall']
  "Vier-Theme" Some more design stuff.
  some revision to the German strings
  German strings
  Wrong variable name
  show experimental and unsupported theme status on theme admin page
  jumping divs with no scrolling
  imrpove contrast on darkzero blockquotes
  darkzero-NS theme
  ...

* master:

From 72e78046afbd1977ff7b5458005cd62471faba0e Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 01:04:41 -0500
Subject: [PATCH 2/2] minor typographical fixes. need to do something about the
 http on https sites for html5shiv. changed to https on mine

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/head.tpl       | 2 +-
 view/jot-header.tpl | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/view/head.tpl b/view/head.tpl
index 2a1837088..da6ec1159 100755
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -11,7 +11,7 @@
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
-         title="Search in Friendika" />
+         title="Search in Friendica" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 007f639b6..d6b172b6a 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -15,7 +15,7 @@ function initEditor(cb){
 			$("a#jot-perms-icon").fancybox({
 				'transitionIn' : 'elastic',
 				'transitionOut' : 'elastic'
-			}); 
+			});
 			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
 			return;
@@ -129,7 +129,6 @@ function enableOnUser(){
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
-	
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',