From 1cd1f7587c8dadc9368e0089613d75988d7e3d53 Mon Sep 17 00:00:00 2001
From: Johannes Schwab <mail@jschwab.org>
Date: Mon, 23 Feb 2015 12:20:05 +0100
Subject: [PATCH 1/2] fix validate_email

---
 include/network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/network.php b/include/network.php
index 190dce326e..1fa7486b0a 100644
--- a/include/network.php
+++ b/include/network.php
@@ -651,7 +651,7 @@ function validate_email($addr) {
 		return false;
 	$h = substr($addr,strpos($addr,'@') + 1);
 
-	if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+	if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
 		return true;
 	}
 	return false;

From 6a5bb80c824dd74f0473facc5db490e7f400a931 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 24 Feb 2015 09:00:37 +0100
Subject: [PATCH 2/2] Friendica 3.3.3 See CHANGELOG

---
 CHANGELOG | 5 +++++
 boot.php  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c6de0ae49a..4f0c232333 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,11 @@ Version 3.3.3
 	Fix tools for translations (ddorian1)
 	Fix API login via LDAP (issue #1286) (fabrixxm)
 	Fix to link URL in tabs, pager (issues #1341, #1190) (ddorian1)
+	Fix poke activities translation (fabrixxm)
+	Fix html escaping in templates (fabrixxm)
+	Fix Friendica contacts shown as Diaspora contacts via Poco (annando)
+	Fix shared contacts wrong linking (issue #1388) (annando)
+	Fix email validation (ddorian1)
 	Better documentation for developers (silke)
 
 Version 3.3.2
diff --git a/boot.php b/boot.php
index 4ff0e4fbea..d74f38914c 100644
--- a/boot.php
+++ b/boot.php
@@ -16,7 +16,7 @@ require_once('include/dbstructure.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Ginger');
-define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
+define ( 'FRIENDICA_VERSION',      '3.3.3' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1178      );
 define ( 'EOL',                    "<br />\r\n"     );