]> 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 22:25:46 +0000 (15:25 -0700)
committerEvan Prodromou <evan@status.net>
Mon, 2 May 2011 22:25:46 +0000 (15:25 -0700)
commitf5aba994b2ca6dbe9d4dfd83d615d7bc3dcf2982
treeca1ea5e0522f0b6110cad21202990875ae92331f
parent48f6af3a8ac700784790a406e21ed8cbe95c59c7
parent90eb09624c7ef82824669431283e121461a6799b
Merge branch '1.0.x' into testing