]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:22:51 +0000 (17:22 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:22:51 +0000 (17:22 -0400)
commit78cec7ab87c005e988dbd8176585ffad9182d25c
tree735c4755433140939e6b841f971a273c6a2f76f8
parent8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac
parent49bce941a9aae495ee7221bd367791227487b458
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
install.php
lib/noticeform.php
install.php
lib/noticeform.php