]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Mon, 2 May 2011 18:59:47 +0000 (11:59 -0700)
committerEvan Prodromou <evan@status.net>
Mon, 2 May 2011 18:59:47 +0000 (11:59 -0700)
commit48f6af3a8ac700784790a406e21ed8cbe95c59c7
tree541df30ac593ad9813185be7c0e8487a6a780880
parent1e2d317b9c8e43d057c825aa265f15419c919e77
parentc05b3b5bd25a660f27a900f0f20de051c8664963
Merge branch '1.0.x' into testing