From: Zach Copley <zach@status.net>
Date: Sat, 17 Sep 2011 20:06:12 +0000 (-0700)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b83012878fbfd9c0da0eae1a80ff9e64a815cfbc;p=quix0rs-gnu-social.git

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

* 'testing' of gitorious.org:statusnet/mainline:
  disable routes that aren't available in single-user mode
  upgrade to beta4
  Better error handling when the email subsystem isn't working. The installer was dying trying to send a confirmation email to the initial user.
  Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)
  Upgrade 0.9.x bookmarks to 1.0.x
  add hooks for upgrades
---

b83012878fbfd9c0da0eae1a80ff9e64a815cfbc