2 Commits (1fda9e9365c62cc61788e25d6c7d802f5065fbc8)

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	af9f7da449	catalan translation	2012-03-08 16:29:22 -08:00