]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into testing
authorEvan Prodromou <evan@status.net>
Tue, 8 Dec 2009 19:43:21 +0000 (14:43 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 8 Dec 2009 19:43:21 +0000 (14:43 -0500)
1  2 
classes/statusnet.ini

Simple merge