From: Zach Copley <zach@status.net>
Date: Fri, 8 Apr 2011 22:47:18 +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=e3789488c60c245017b5a685245b2e9b25cc7557;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:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
---

e3789488c60c245017b5a685245b2e9b25cc7557