2 commits

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
tommy tomson	0b41654935	bug-fixes in diabook-derivates	2012-03-31 11:09:57 +02:00