Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Fri, 4 May 2012 15:39:55 +0000 (11:39 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 4 May 2012 15:39:55 +0000 (11:39 -0400)
commitc5ae53166ce4b80cc57055ff220e282147177e4d
treeaca282aa2753494dcfebb1446369d294808c875e
parentab053fe2ca8bb2be76d6af0d313f38d89540d768
parenteafe507068537b5588f3f452eac5f219e25ede06
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x