]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote branch 'origin/1.0.x' into 1.0.x
authorSamantha Doherty <sammy@status.net>
Thu, 5 May 2011 20:00:37 +0000 (16:00 -0400)
committerSamantha Doherty <sammy@status.net>
Thu, 5 May 2011 20:00:37 +0000 (16:00 -0400)
commit68d960ccebb621617cff83bc229aacf952dc7a13
tree8d44b710a52cd215eeccf09d518e17a0b3a0f1d5
parent07d9832ce9d5d1cf0e11adf23916793e2aa616e5
parent763229aedeccfed80a1524deb65b262f75546aea
Merge remote branch 'origin/1.0.x' into 1.0.x