]> 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>
Tue, 1 Mar 2011 23:26:02 +0000 (15:26 -0800)
committerZach Copley <zach@status.net>
Tue, 1 Mar 2011 23:26:02 +0000 (15:26 -0800)
commit243b39666064dfa1eee85f08fadae2467ca4612e
tree896caf7b40fb35b832d05460eaabd49a6bb112ed
parent2fb81487881083034308e89da210fe630363b5bc
parentc6521db620a63cfda0e717e558caf4ea221129a9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x