]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 5 May 2011 21:45:50 +0000 (14:45 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 5 May 2011 21:45:50 +0000 (14:45 -0700)
commite863903263d4657ec8e4e56d5bd25bea9b40af29
tree105d875688afb27d0b2d0ae4ae0bb04490442e85
parent78a9d4966ec997c0ce6e72eecfadaa53074369c3
parentd4aef7a007c1c605917dc1924351f0281c6f2763
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x