Merge branch 'testing' of gitorious.org:statusnet/mainline into ostatus-testing
authorBrion Vibber <brion@pobox.com>
Fri, 5 Feb 2010 18:04:05 +0000 (10:04 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 5 Feb 2010 18:04:05 +0000 (10:04 -0800)
commit91295e19e3036dd597679f5ba70f2d4ca476000d
treed44180bfa3c958f1f5662213732dd4d9b60efacd
parentfe46ea678310414c410d07f88d6d94eab67292cb
parent875e1a70ce231b6b07765210328656abb353ad5b
Merge branch 'testing' of gitorious.org:statusnet/mainline into ostatus-testing
db/statusnet.sql