]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Wed, 27 Jan 2010 22:14:18 +0000 (14:14 -0800)
committerZach Copley <zach@status.net>
Wed, 27 Jan 2010 22:14:18 +0000 (14:14 -0800)
* 'testing' of gitorious.org:statusnet/mainline:
  Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
  Add new oauth tables and modifications to 'consumer' table for rc4


Trivial merge