Merge commit 'upstream/master'
[friendica.git/.git] / spec / dfrn2.odt
2012-03-11 Michael VogelMerge commit 'upstream/master'
2012-03-10 tomtom84Merge pull request #118 from tomtom84/master
2012-03-10 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-10 friendicaMerge branch 'pull'
2012-03-10 friendicaspec directory