]> 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>
Fri, 11 Mar 2011 01:16:28 +0000 (17:16 -0800)
committerZach Copley <zach@status.net>
Fri, 11 Mar 2011 01:16:28 +0000 (17:16 -0800)
commit3730b650ab32e03eb5365e56ce87d43164d59946
tree40091c8b80e484667b64bbd04da2415b620c5828
parent78ecb17ba103c2b54b35f2d8de69db1a75017fa4
parent874804a0c4c7deb89ca9292a12f684ed9cda388a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x