Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 2 Dec 2011 20:48:43 +0000 (15:48 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 2 Dec 2011 20:48:43 +0000 (15:48 -0500)
commit821904230ddc971feb23eccdf06c41be4568958c
tree791afe6a0ffe0c939328911e33f055d74cd6d9d7
parentad2fd9abd43e55e53efa43e781e2877d3e7eec24
parent600a718a3374f93aa3ea00f8d684b3c205f9c76a
Merge branch 'master' of gitorious.org:statusnet/mainline