2 Commits (20a16b0b357bee5fdf8947e7bc8e3b36540f22f4)

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	0e3b9097f6	spec directory	2012-03-09 19:50:31 -08:00