Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:28 +0000 (10:47 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:28 +0000 (10:47 -0400)
commit90fa1deb80bbab74aeb06e9ab88064b1edd3c023
tree8fa3fe7ec00b2b84aa64b0a68de4e651f44e1695
parent0c6ca3ec415df1324666ceb85950ec730b943500
parent46f6b2c1196575a6eb5baf35c3016ff99dfba891
Merge branch 'master' of gitorious.org:statusnet/mainline