2 Commits (e0e82afe18e4db3965707c0be0e1888521810939)

Author	SHA1	Message	Date
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
friendica	b1d31aca51	quick comments	2012-02-15 18:13:41 -08:00