From: Zach Copley <zach@status.net>
Date: Sun, 28 Aug 2011 01:47:19 +0000 (-0700)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=500ec79e391163f15a6a886968141ac37e89c52c;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  add conversation ID to notice output
  For fave count, don't use distinct
  Static -> static
  allow posting to groups through atompub
---

500ec79e391163f15a6a886968141ac37e89c52c