Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php		2012-04-05 13:39:15 +02:00
..
Cleanup.php	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
Memory.php	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
Template.php.in	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00