]> 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, 6 Jul 2011 00:30:01 +0000 (17:30 -0700)
committerZach Copley <zach@status.net>
Wed, 6 Jul 2011 00:30:01 +0000 (17:30 -0700)
commit038ee13e79e969450d8e56e1705662ce7f0edf73
tree127225476e8664d16ae40ec552e450569214d549
parent7150c54a3f437043eac95d57ac9fc0672adef564
parent3226f2bef6fe7d8fdfbc7b9e19ade333b724f3d7
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x