Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Sat, 27 Aug 2011 15:29:26 +0000 (11:29 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 27 Aug 2011 15:29:26 +0000 (11:29 -0400)
commitbce337e7c31c2badf34a3af99da6fc2158eedddd
tree155a06b4c373fcbfc10a6802efbdb4d1038019b4
parentdd5da6c9e871037be342b9bb5f49bb8f1d5da099
parent21011cfc929bfb6d4f4727fdddd30d4f225f2570
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x