Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:44:03 +0000 (15:44 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:44:03 +0000 (15:44 -0400)
commit7d07149f6070f0899dbaa4b4741b4db7ca94dec5
treed264a39d6db9148fb6f1b5e96759c1cf857066ec
parentea0a1b6a03accf04c770ce5195713bd7d8039828
parent8f7f06e35a1763c3f6715a06999704ecbe4b36b1
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x