Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Sat, 17 Sep 2011 20:06:12 +0000 (13:06 -0700)
committerZach Copley <zach@status.net>
Sat, 17 Sep 2011 20:06:12 +0000 (13:06 -0700)
commitb83012878fbfd9c0da0eae1a80ff9e64a815cfbc
tree415cfd52ee85a539e599fdde2f2b03e4961dab8a
parent1f87e77701352c297918b21fc082ae96d0ca3b2c
parentfc3d52c120f219a1cdc57b9d2f7646c7231155f3
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