projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87c4d1c 9b2669e)
Merge branch 'pull'
authorfriendica <info@friendica.com>
Thu, 12 Jan 2012 21:59:07 +0000 (13:59 -0800)
committerfriendica <info@friendica.com>
Thu, 12 Jan 2012 21:59:07 +0000 (13:59 -0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.