From 86c8362bb8aef36400df902a96538a92ee49f3c7 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 6 Nov 2014 20:31:27 +0100
Subject: [PATCH] Bump version to 3.3.1. Add CHANGELOG file

---
 CHANGELOG | 29 +++++++++++++++++++++++++++++
 boot.php  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000000..165695f8f6
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,29 @@
+Version 3.3.1
+
+	JSONP support for API (fabrixxm)
+	Fixed small bug in direct messages API (fabrixxm)
+	More filter for direct messages API (fabrixxm)
+	New hooks "getsiteinfo", "page_info_data" (annando)
+	Better loop post prevention (annando)
+	Via API, replace data: uri images in plain text version with link to post. (issue #1134) (fabrixxm)
+	Set default location to empty for new users. Suppress warning on user creation (issue #1193) (fabrixxm)
+	Correctly build urls with queries (issue #1190) (fabrixxm)
+	Optionally use keywords in feed as post tags with "remote self" (annando)
+	A blacklist of keywords to not use can be defined (annando)
+	"remote self" works also with Friendica and Diaspora contacts (annando)
+	Show exact post time after 12 hours (FX7)
+	Optionally redirect from non-SSL to SSL (annando)
+	Translation updates
+	Added CHANGELOG
+
+Version 3.3
+
+	See http://friendica.com/node/64
+
+Version 3.2
+
+	See http://friendica.com/node/61
+
+Version 3.1
+
+	See http://friendica.com/node/58
\ No newline at end of file
diff --git a/boot.php b/boot.php
index cde1220a5e..eb0eb3e662 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' );
+define ( 'FRIENDICA_VERSION',      '3.3.1' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1174      );
 define ( 'EOL',                    "<br />\r\n"     );