]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
authorEvan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 08:52:46 +0000 (09:52 +0100)
committerEvan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 08:52:46 +0000 (09:52 +0100)
commit25ff381486423e1611999a239a69e2712ac70576
tree36119622a5c7f25d7cd95ff8672a846b62a10a7a
parentdaf32e43cd100a6097bc5eaa55f5bf396d374dc5
parent0aa2cb35f19fa52160331e9a3846fc9a37a8bc98
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk