607 commits

Author	SHA1	Message	Date
friendica	185d29c41e	undefined element	2013-05-02 21:42:34 -07:00
friendica	61a0f9c196	bug #540 and hush up a couple of log messages that are way too verbose	2013-04-28 04:30:20 -07:00
friendica	1ed6a2bd3d	rev update	2013-04-25 02:36:52 -07:00
friendica	f4b3cf980d	rev update	2013-04-23 18:51:35 -07:00
friendica	bc68892cf9	rev update	2013-04-21 16:07:02 -07:00
friendica	a13e7b8a38	rev update	2013-04-19 04:51:43 -07:00
friendica	9660117c70	sync username when changed in either the default profile or the settings page	2013-04-04 15:10:14 -07:00
friendica	db0bb50e37	rev update	2013-04-03 16:28:49 -07:00
friendica	17cb682ed0	rm addon.old	2013-03-19 03:30:50 -07:00
friendica	1ff37ca4c1	double encode any text that is destined for meta fields.	2013-03-18 16:40:33 -07:00
Fabrixxm	3d3aebeda1	fix bug in run_xgettext, update messages.po	2013-02-28 10:14:40 -05:00
Fabrixxm	5214eb2bda	update util/messages.po	2013-02-27 09:44:05 -05:00
Fabrixxm	a1746a9fd2	run_xgettext: check for dir before run xgettext	2013-02-27 09:42:20 -05:00
Fabrixxm	9d99a531b9	update translation utils: ... po2php: add "if function_exists" around plural select function run_xgettext: add option to extract strings from addon folder	2013-02-27 08:25:03 -05:00
friendica	5205a374ee	block injection vector	2013-02-26 17:33:18 -08:00
friendica	c8717ede42	rev update	2013-02-22 17:12:03 -08:00
friendica	615b060352	rev update	2013-02-21 16:42:34 -08:00
friendica	d653bc4dbd	rev update	2013-02-17 17:23:19 -08:00
friendica	6242f9a147	add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication.	2013-02-07 23:43:55 -08:00
friendica	ff8c1be987	Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util ... move tpl scripts to util	2013-02-05 17:19:23 -08:00
friendica	79e9214a75	Merge https://github.com/friendica/friendica into pull	2013-02-05 15:10:23 -08:00
friendica	9bf8364506	rev update	2013-02-05 15:09:28 -08:00
Zach Prezkuta	53e5592f9a	move tpl scripts to util	2013-02-04 22:55:15 -07:00
Zach Prezkuta	0e67ba2bd4	update minified javascripts	2013-02-04 18:16:13 -07:00
Zach Prezkuta	7d3a923294	script for minifying javascript files	2013-01-31 19:05:27 -07:00
friendica	de0098a6b4	rev update	2013-01-29 18:35:25 -08:00
friendica	ce8f31504e	rev update	2013-01-27 13:13:08 -08:00
friendica	04b48688b6	add form security to invite page and set maximum per user invites	2013-01-25 13:48:57 -08:00
friendica	b3b0a9de24	die forcefully but gracefully on missing api templates	2013-01-23 17:07:55 -08:00
friendica	20eb767b7e	don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation).	2013-01-18 17:37:45 -08:00
friendica	30f1fb2c4d	provide a date indication in reshared content	2013-01-15 14:58:50 -08:00
fermionic	b920ce732c	Merge pull request #585 from fermionic/20130114-maintenance-mode ... add maintenance mode	2013-01-14 18:18:34 -08:00
friendica	66a6970bb8	config cli will also work with Friendica without change - so bringing it over	2013-01-14 15:50:39 -08:00
Zach Prezkuta	31c3bbf549	add maintenance mode	2013-01-14 16:35:41 -07:00
friendica	b5c0714bc4	fix live update on display page	2013-01-12 15:08:59 -08:00
friendica	dfee9faca5	rev update	2013-01-10 22:27:41 -08:00
friendica	51eb0cd59d	rev update	2013-01-10 01:08:36 -08:00
friendica	de0315396c	missing session template_engine calls	2013-01-08 12:24:13 -08:00
friendica	4ab363ed71	bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)	2013-01-07 20:14:00 -08:00
friendica	9fbaa0d383	rev update	2013-01-04 15:14:00 -08:00
friendica	e394ccd0a8	If we're going to encode the email headers, we probably should use the encoded version rather than the original	2013-01-03 03:47:08 -08:00
friendica	66b1448cdb	rev update	2013-01-01 17:32:46 -08:00
friendica	017042d5d4	rev update	2012-12-31 14:54:04 -08:00
friendica	215a7f139c	make smarty error reporting a bit less chatty	2012-12-30 00:29:07 -08:00
friendica	f962ecdd64	Merge https://github.com/friendica/friendica into pull	2012-12-29 02:36:19 -08:00
friendica	05996457f9	receiving post from archived Diaspora contacts	2012-12-29 02:35:41 -08:00
Zach Prezkuta	e684324032	use explicit include paths	2012-12-28 14:51:50 -07:00
friendica	255771f295	rev update	2012-12-27 13:36:23 -08:00
friendica	2684981941	rev update	2012-12-26 13:09:00 -08:00
friendica	6b36927d32	rev update	2012-12-22 22:59:12 -08:00
friendica	0f13995035	rev update	2012-12-19 03:15:48 -08:00
friendica	3f63a69d7a	divide by zero on incorrectly specified oembed thumbnail size	2012-12-16 17:58:12 -08:00
friendica	6faadc9662	anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.	2012-12-13 14:15:18 -08:00
friendica	5d757b0668	add sample nginx config from Olaf Conradi to mods directory	2012-12-12 15:54:13 -08:00
friendica	bc3a704e02	bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations	2012-12-09 13:44:48 -08:00
friendica	6e7e41360f	rev update	2012-12-07 15:58:42 -08:00
friendica	376bf517a4	bug #516 - set writable on first poll	2012-12-06 13:59:20 -08:00
friendica	d193093106	rev update	2012-12-04 14:08:55 -08:00
friendica	8ab24858fb	fix "insert web link" for those without richtext feature enabled	2012-12-03 16:31:28 -08:00
friendica	ee0def3ef5	rev update	2012-12-02 13:47:24 -08:00
friendica	b130c892b2	features categories were un-translatable	2012-11-28 19:25:09 -08:00
friendica	32868dab79	catch stragglers in "chunked" delivery mode	2012-11-27 15:17:41 -08:00
friendica	bb51be4ea8	rev update	2012-11-25 19:21:08 -08:00
friendica	278f30790a	rev update	2012-11-22 20:54:44 -08:00
friendica	d3b2b1b7ec	rev update	2012-11-21 15:40:07 -08:00
friendica	70d0ed9402	log directory updates	2012-11-18 22:53:01 -08:00
friendica	ab0dc3131a	fix wallmessage	2012-11-14 13:59:31 -08:00
friendica	eecf099079	Merge https://github.com/friendica/friendica into pull	2012-11-13 17:15:56 -08:00
friendica	66f0cf9f5b	rev update	2012-11-13 17:15:17 -08:00
Fabrixxm	8de346b943	fix po2php \"" issue.	2012-11-13 10:02:03 -05:00
friendica	009744af50	allow posted ACLs to be comma-delimited string besides the default array	2012-11-11 13:56:21 -08:00
friendica	de5a21bec4	improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago.	2012-11-11 00:28:21 -08:00
friendica	9b629186a9	rev update	2012-11-08 16:29:54 -08:00
friendica	776552226b	Merge https://github.com/friendica/friendica into pull	2012-11-06 01:10:36 -08:00
friendica	fd4d35b16c	set writable for ostatus followers	2012-11-06 01:10:12 -08:00
Fabrixxm	5b4944fe8e	Merge remote-tracking branch 'remotes/friendica/master' into moveme	2012-11-05 09:37:58 +01:00
Fabrixxm	385ee5a862	pass $argv & $argc as reference to *_run() functions.	2012-11-05 09:28:54 +01:00
friendica	caebcc5e83	rev update	2012-11-04 13:43:28 -08:00
friendica	6ca9f0e5fa	string update	2012-11-03 15:31:33 -07:00
friendica	3303d9db75	put 1i8n position orders in welcome string	2012-11-03 14:43:48 -07:00
friendica	08121ad6b4	rev update	2012-11-01 17:21:39 -07:00
friendica	68da185cce	rev update	2012-10-30 14:23:11 -07:00
friendica	0fe9019c08	rev update	2012-10-29 21:01:15 -07:00
friendica	81a21257c3	rev update	2012-10-27 15:42:23 -07:00
friendica	88c8387c44	revive "mark everything seen" on main network page - see comments	2012-10-26 14:29:42 -07:00
friendica	89d0b6926c	rev update	2012-10-23 03:29:27 -07:00
friendica	02251f23df	undefined fn: init_groups_visitor in mod_profile, rev update	2012-10-21 14:41:10 -07:00
friendica	2347a4326c	get rid of 'Friendika'	2012-10-18 21:51:45 -07:00
friendica	b39d9d3e71	rev update	2012-10-17 15:22:09 -07:00
friendica	a02e5f692e	disabling auto_redir until we prevent it from infinite looping	2012-10-15 16:28:43 -07:00
friendica	dec5298248	rev update	2012-10-14 17:16:25 -07:00
friendica	675aa56b02	rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared	2012-10-10 15:57:40 -07:00
friendica	17679152d5	rev update	2012-10-09 17:00:29 -07:00
friendica	e24fd2410d	rev update	2012-10-07 15:28:05 -07:00
friendica	52062ac9e0	rev update	2012-10-05 02:09:55 -07:00
friendica	1e93c85a49	rev update	2012-10-03 18:26:53 -07:00
friendica	0f09cb46ab	rev update	2012-09-30 02:08:01 -07:00
friendica	c884e82776	rev update	2012-09-29 05:19:45 -07:00
friendica	260b0f7fe8	rev update	2012-09-27 19:53:23 -07:00
friendica	eaaf14736c	rev update	2012-09-26 18:23:08 -07:00
friendica	e433f20cd8	sort out the 'delete selected' mess	2012-09-25 19:10:46 -07:00
friendica	98064fc627	rev update	2012-09-24 20:54:20 -07:00
friendica	fbd120f1ce	rev update	2012-09-23 17:16:01 -07:00
friendica	b6b8f40fa9	Merge https://github.com/friendica/friendica into pull	2012-09-21 18:10:32 -07:00
friendica	c2af97ef61	rev update	2012-09-21 18:04:09 -07:00
Fabrixxm	eda96a82d7	Update util/typo.php to check in to 'object' folder	2012-09-20 09:32:42 +02:00
friendica	09a00a9a07	html tag completed early	2012-09-19 15:34:21 -07:00
friendica	8596a275fc	rev update	2012-09-18 17:24:45 -07:00
friendica	5b325935c2	rev update	2012-09-16 19:19:50 -07:00
friendica	669d2b890e	rev update - add cancel markup to editor	2012-09-15 15:23:15 -07:00
friendica	aa37b0cb0f	rev update	2012-09-13 16:58:06 -07:00
friendica	3b8eb5d66b	rev update	2012-09-12 17:18:10 -07:00
friendica	a8d12061ca	rev update + multiple profile photos	2012-09-11 18:56:38 -07:00
friendica	ad872845cd	rev update	2012-09-10 16:19:34 -07:00
friendica	0790af15fa	rev update + bug 477 'Romania' misspelled	2012-09-09 15:35:33 -07:00
friendica	032507bd6d	rev update	2012-09-08 18:11:08 -07:00
friendica	cc9a1a6474	rev update	2012-09-06 17:20:31 -07:00
friendica	f8b81b31f2	rev update	2012-09-05 15:43:19 -07:00
friendica	a9deda1e5e	rev update	2012-09-04 20:41:44 -07:00
friendica	ca371de509	rev update	2012-09-03 21:31:00 -07:00
friendica	39c7b34276	rev update	2012-09-02 01:47:04 -07:00
friendica	724583e386	rev update	2012-08-28 19:08:17 -07:00
friendica	9a50454290	rev update	2012-08-23 16:35:40 -07:00
friendica	175849494c	rev update	2012-08-22 20:39:36 -07:00
friendica	154be4bc5c	rev update	2012-08-21 19:40:28 -07:00
friendica	179292f758	rev update	2012-08-20 21:36:04 -07:00
friendica	bcec1bddc0	put the real post time into the post	2012-08-19 14:39:43 -07:00
friendica	862a12f8f5	rev update	2012-08-18 15:17:07 -07:00
friendica	d233beb4ce	rev update	2012-08-17 22:05:42 -07:00
friendica	f9d703b8fc	rev update	2012-08-16 15:24:02 -07:00
friendica	6184b5cf5a	rev update	2012-08-15 17:12:58 -07:00
friendica	7718b6abea	rev update	2012-08-14 15:21:54 -07:00
friendica	3a601ff66f	rev update	2012-08-13 16:46:24 -07:00
friendica	962c357ebd	common_friends_visitor_widget warning	2012-08-12 15:54:38 -07:00
friendica	1cd23860cb	rev update	2012-08-11 15:39:45 -07:00
friendica	b960352b54	rev update	2012-08-10 16:02:20 -07:00
friendica	ba9c50c0dd	rev update	2012-08-09 15:32:07 -07:00
friendica	101df5145e	rev update	2012-08-08 17:06:54 -07:00
friendica	558fbcc69e	rev update + don't tag anything in [] brackets	2012-08-06 19:50:57 -07:00
friendica	5d7f9d3b4b	rev update	2012-08-05 21:43:20 -07:00
friendica	bf19e62ecd	rev update	2012-08-04 17:02:05 -07:00
friendica	621e737826	fix angle char storage and transmission, rev update	2012-08-03 18:33:11 -07:00
friendica	864b5fc256	rev update	2012-08-02 14:15:56 -07:00
friendica	4cbde6a75d	rev update	2012-08-02 01:23:16 -07:00
friendica	49ad9b355c	rev update	2012-07-31 18:01:55 -07:00
friendica	27ee8620f9	rev update	2012-07-30 14:14:20 -07:00
friendica	299f9e3d9e	rev update	2012-07-29 15:32:26 -07:00
friendica	61115d7a07	rev update	2012-07-28 16:12:12 -07:00
friendica	50e20a1494	rev update	2012-07-27 17:52:43 -07:00
friendica	b9f13400d9	rev update	2012-07-25 15:52:26 -07:00
friendica	f48e491ba0	rev update	2012-07-24 17:24:53 -07:00
friendica	b20a80bf39	rev update	2012-07-23 15:27:25 -07:00
friendica	cdf67ce725	rev update	2012-07-22 15:39:25 -07:00
friendica	5255a5c9a9	rev update	2012-07-21 16:44:15 -07:00
friendica	8c83828f83	rev update	2012-07-20 15:12:21 -07:00
friendica	b6a3471608	rev update	2012-07-19 15:27:22 -07:00
friendica	ac47edb775	rev update	2012-07-18 16:28:19 -07:00
friendica	749ae9b297	filter the protocol specifier in bbcode links.	2012-07-17 18:33:04 -07:00
friendica	e477683987	rev update	2012-07-16 17:03:23 -07:00
friendica	3408a56dd3	rev update	2012-07-15 14:22:45 -07:00
friendica	c87d3cb86f	rev update	2012-07-14 14:16:24 -07:00
friendica	bbb022f564	rev update	2012-07-13 13:52:23 -07:00
friendica	ce5ca967c1	rev update	2012-07-12 16:11:43 -07:00
friendica	24ea480276	rev update	2012-07-11 17:55:39 -07:00
friendica	12255dded5	rev update	2012-07-10 18:05:13 -07:00
friendica	1fda9e9365	rev update	2012-07-10 01:06:11 -07:00
friendica	caabb43326	diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match.	2012-07-08 22:32:04 -07:00
friendica	63f10f6c6b	Merge https://github.com/friendica/friendica into pull	2012-07-07 21:55:15 -07:00
friendica	e94f7ed23d	rev update	2012-07-07 16:20:34 -07:00
Vasudev Kamath	ba4db236ec	Merge branch 'master' of git://github.com/friendica/friendica	2012-07-06 22:47:27 +05:30
friendica	9951071b5b	rev update	2012-07-05 16:06:01 -07:00
friendica	5589bca1e0	fix !@#$ tinymce linebreaks for the thousandth time	2012-07-04 17:15:43 -07:00
friendica	7926a0d171	add link to shares	2012-07-03 16:26:14 -07:00
friendica	ced0a208d8	fix double lines	2012-07-02 16:34:01 -07:00
friendica	dd71f9446b	config to disable email validation	2012-07-01 18:56:00 -07:00
friendica	7747f6fc96	rev update	2012-06-30 17:38:02 -07:00
friendica	78e03abed8	convert ent_quotes for jquery calendar title/summary	2012-06-29 20:11:36 -07:00
friendica	de93c61e0d	remove titles in ostatus even when edited date differs from created date	2012-06-28 16:04:00 -07:00
friendica	b02c733967	service class restrict the email connector	2012-06-26 18:30:20 -07:00
friendica	eebb2d2120	rev update	2012-06-25 15:34:23 -07:00
friendica	9528beac34	sidebar photo album list not visible to anybody if user['hidewall'] set	2012-06-24 16:51:39 -07:00
friendica	1574396d04	sort out some "like" issues	2012-06-23 21:11:18 -07:00
Vasudev Kamath	6e4760dd9c	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-23 08:11:35 +05:30
friendica	181a17bd05	share RSS items	2012-06-22 15:27:06 -07:00
friendica	eeceecc9ba	unterminated sql string	2012-06-22 00:25:01 -07:00
friendica	0f0e5be549	contact search oddities	2012-06-20 16:05:46 -07:00
friendica	9c844e3bbe	rev update	2012-06-19 16:04:20 -07:00
friendica	341a5a2672	public forum author using private posting, correct the comment permissions downstream.	2012-06-18 17:19:56 -07:00
friendica	b385729c17	rev update	2012-06-17 16:00:47 -07:00
friendica	7c2d27e275	rev update	2012-06-16 17:29:42 -07:00
friendica	4faf0e609f	rev update	2012-06-16 03:35:45 -07:00
friendica	be090cc851	better handling of dead contacts	2012-06-14 16:56:46 -07:00
friendica	85876be48a	Merge https://github.com/fabrixxm/friendica into pull ... Conflicts: util/messages.po	2012-06-13 16:25:09 -07:00
friendica	d908c9dd71	disable archive widget for PHP < 5.3	2012-06-13 16:17:45 -07:00
fabrixxm	46cb8174fa	enotify: rework strings to more easy to translate	2012-06-13 11:55:21 -04:00
friendica	832d9eeaaf	more fixes	2012-06-12 16:17:34 -07:00
friendica	3b9c3d886d	sheesh	2012-06-11 16:21:27 -07:00
Vasudev Kamath	11974b4d94	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-11 20:47:11 +05:30
friendica	4f9fb37925	rev update	2012-06-10 16:31:00 -07:00
friendica	ff8d159698	rev update	2012-06-10 00:59:36 -07:00
friendica	c4aeb57fcd	rev update	2012-06-07 15:46:07 -07:00
friendica	dd001e32f4	rev update	2012-06-06 16:02:10 -07:00
friendica	5389efffa9	add email probe logging, limit typo check to main addon files and skip additional support files	2012-06-05 19:28:04 -07:00
friendica	7cc7a14380	rev update	2012-06-05 17:59:12 -07:00
Vasudev Kamath	12474e3c2e	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-04 12:04:17 +05:30
friendica	0b657aa235	rev update	2012-06-03 14:47:53 -07:00
friendica	4978ee12d1	webfinger profile linker	2012-06-02 18:05:23 -07:00
friendica	0165d5dd2c	registration issue after re-factor	2012-06-01 15:42:13 -07:00
friendica	93bc29a711	turn registration code into a standalone function for re-use	2012-05-31 19:06:17 -07:00
friendica	069361f946	rev update	2012-05-30 15:50:30 -07:00
friendica	419cf91aae	bugfixes: private photo embeds and search for strings with %	2012-05-29 16:44:02 -07:00
friendica	f033c9a4ae	rev update	2012-05-28 16:51:52 -07:00
friendica	2bd1004587	rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.	2012-05-27 21:01:58 -07:00
friendica	73c61b6f96	allow force ssl on notifications	2012-05-26 16:11:51 -07:00
friendica	fafd41f4bf	keep private FB stuff out of personal notes	2012-05-25 14:36:17 -07:00
friendica	abb9fecf09	rev update	2012-05-25 00:42:38 -07:00
friendica	6bcfda6d53	rev update	2012-05-23 15:46:04 -07:00
friendica	e70573f34c	if identity (uid) changes - reload any other open browser windows on next ping.	2012-05-22 16:01:07 -07:00
friendica	54e2c1ca81	rev update, bug 428, 429, and ability to block globaldir submissions from demo sites	2012-05-21 16:40:11 -07:00
friendica	afaf9ec74f	rev update	2012-05-20 18:30:02 -07:00
friendica	dd86f40f96	set comment permissions explicitly to parent permissions	2012-05-19 16:42:24 -07:00
friendica	4133df6223	profile change activity link bug	2012-05-18 17:55:11 -07:00
friendica	d5d853f37f	setup delivery chain for private groups (work in progress)	2012-05-17 19:35:24 -07:00
friendica	6744b5975c	rev update	2012-05-16 13:52:11 -07:00
friendica	205c09e4f0	rev update	2012-05-15 17:05:28 -07:00
friendica	2b471d6df3	rev update	2012-05-14 16:32:21 -07:00
friendica	2bd4ff5705	rev update	2012-05-13 16:40:02 -07:00
friendica	3811fe288f	rename get_language() to get_browser_language()	2012-05-13 04:52:29 -07:00
friendica	e7813f22af	slackr drop shadows	2012-05-12 22:19:29 -07:00
friendica	aa83198611	rev update	2012-05-12 01:27:33 -07:00
Vasudev Kamath	10db2f00f9	Merge branch 'master' of git://github.com/friendica/friendica	2012-05-12 12:10:09 +05:30
friendica	8600afafe2	rev update	2012-05-10 18:50:11 -07:00
friendica	8be8db39de	rev update	2012-05-09 17:56:05 -07:00
friendica	10812e0c19	make it optional to optimize the item table after expire	2012-05-08 15:33:01 -07:00
friendica	189a31e628	If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue ... and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.	2012-05-07 15:54:49 -07:00
friendica	8e46c43ee1	rev update	2012-05-06 19:52:22 -07:00
friendica	49ccefd6c7	bad sql left after the mailbox in/out merge	2012-05-05 17:53:23 -07:00
Vasudev Kamath	b5e857c0e7	Merge branch 'master' of git://github.com/friendica/friendica	2012-05-05 20:48:16 +05:30
friendica	7c6e8b30b2	only show remove category to item owner	2012-05-04 16:45:10 -07:00
friendica	f2d3039aed	string update	2012-05-03 17:20:24 -07:00
friendica	f3e18df55d	string update	2012-05-03 16:55:03 -07:00
friendica	3be9cddfd7	rev update	2012-05-02 15:26:57 -07:00
friendica	38ccd2e655	convert html entities to utf-8 before email header encoding	2012-05-01 15:49:22 -07:00
friendica	88c77083e6	rev update	2012-04-30 17:17:19 -07:00
friendica	e3fecb2557	improved db error logging	2012-04-29 17:34:54 -07:00
friendica	4ff2e9a103	a few more continues that should be returns	2012-04-28 16:54:33 -07:00
friendica	c3f70a9e56	string update	2012-04-27 17:19:10 -07:00
friendica	c7cbff6fbb	rev update	2012-04-27 15:55:56 -07:00
Vasudev Kamath	214ec91a3f	Merge branch 'master' of git://github.com/friendica/friendica	2012-04-27 22:43:26 +05:30
friendica	f8e7f28f40	rev update	2012-04-26 15:35:00 -07:00