Friendika c26463b65b Merge branch 'omigeot-master'
Conflicts:
	view/fr/strings.php
2011-02-05 13:01:28 -08:00
..
2011-01-27 16:48:54 +01:00
2011-02-01 18:52:16 +01:00
2011-01-27 16:50:39 +01:00
2011-02-03 03:58:47 -08:00