]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Wed, 13 Jul 2011 23:03:56 +0000 (23:03 +0000)
committerZach Copley <zach@status.net>
Wed, 13 Jul 2011 23:03:56 +0000 (23:03 +0000)
commit37dbaf6c01ec20e4659c41c7f4b631fac94730f4
tree6fe4c9ed2dec0a279b6f458332445a7d06c0f2e1
parent9a51caa485b7eaa486ec4476019777b6a614bbba
parente7bbe6c1b664d579622d4103293b99e2650a6b8a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x