]> 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, 30 Sep 2011 18:15:38 +0000 (18:15 +0000)
committerZach Copley <zach@status.net>
Fri, 30 Sep 2011 18:15:38 +0000 (18:15 +0000)
commit1d2a3be88e43c74ed1ae384d848d15c260016812
tree4c5b82fb3bf21398b0245cf5e0db22de6c908444
parentfd62f6b9340997084a60f0ae5685c6afc1395eba
parent1b94625f2fb2e0a7c8bdd4efe0d0178f1cd552e2
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x