Merge https://github.com/friendica/friendica into pull

diff --git a/boot.php b/boot.php
index 6794a1f9f5529ed52ae9e4f58942b025222a2e1a..b83fe32a1ecb3c170a2758f9ad62d3c15e0a7f97 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1534' );
+define ( 'FRIENDICA_VERSION',      '3.0.1535' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/util/messages.po b/util/messages.po
index 20abd6c3ab4dbd00a3ba3ae161d0bd231d2356f9..9f2d08243a8358645e6537c0058ea8ede2aa435f 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1534\n"
+"Project-Id-Version: 3.0.1535\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-21 10:00-0800\n"
+"POT-Creation-Date: 2012-11-22 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"