]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 12:29:51 +0000 (08:29 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 12:29:51 +0000 (08:29 -0400)
commitc78772b2748f70acc8158b665218fe53b277a031
tree8ff1886b3a95002880c605745029ba52b7303b4f
parentcb2184ed448ecb043d825d4d12b8193d63c4d84c
parent70235d7f05d2ce7dda77af88518612fa005783df
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

Conflicts:
actions/postnotice.php
actions/postnotice.php