Friendika 6b37e6d48d Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php
2011-03-17 14:44:06 -07:00
..
2011-03-12 03:15:38 -08:00
2011-03-12 03:15:38 -08:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00
2011-03-11 20:12:32 +01:00