]> 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>
Tue, 31 May 2011 21:01:11 +0000 (17:01 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 31 May 2011 21:01:11 +0000 (17:01 -0400)
commit506958f2c8970205aa221c7024c19bb87b9324d8
tree120a8cfa9acc1411b3258ce4124b3cf8b4a77014
parent60a1b0a15acad9688777d751a002d4861ae07ae3
parent712ba64fa6a4e862a0ceaf945482f568db7271ab
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x