]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorSamantha Doherty <sammy@status.net>
Fri, 19 Aug 2011 17:02:32 +0000 (13:02 -0400)
committerSamantha Doherty <sammy@status.net>
Fri, 19 Aug 2011 17:02:32 +0000 (13:02 -0400)
commit1b7d1d9a4a41fe68f2ee2c31721a7e99da5a8cc6
treea47b9ca46ca7fb8e4898dd153996a3deb51e9ceb
parent23e5f25d8d75950f16eecb1345ee42cb365cb222
parent5d557a265629d6840270ea1942f1d99f557ffc29
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x