]> 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>
Thu, 5 May 2011 22:00:16 +0000 (15:00 -0700)
committerZach Copley <zach@status.net>
Thu, 5 May 2011 22:00:16 +0000 (15:00 -0700)
commitfc62a8f980bc8706b5aea13bc0be24837d027043
tree61ee3d6aafae95c00dcc632f49bdb1cf512fb191
parent94c858d1e191a92ca36abd47cb5603a67a759963
parente863903263d4657ec8e4e56d5bd25bea9b40af29
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x