]> 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>
Wed, 4 May 2011 23:13:42 +0000 (16:13 -0700)
committerZach Copley <zach@status.net>
Wed, 4 May 2011 23:13:42 +0000 (16:13 -0700)
commitc4aef15a153e961a3a5341d3b3864fdb9b664bb8
tree8c0d9f6b4b9171149e7223a68962ede866be266c
parentf4a06719b1372c43d0b4a01493a93e16ff0ffbb5
parentc97048d01bea468e0cf8865b60c3c250b4515c39
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x