Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 21:33:38 +0000 (17:33 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 21:33:38 +0000 (17:33 -0400)
commite2914189f3d7f11b16c4b4e16106da251433c028
tree1414ed069a3d3a2489339433f73e107725e43cc4
parentcf2457f03f1a3c49d4c4890fa89fdfc396df8995
parent3bf3b6686c699292fb86c9d24658eab0ce5beb71
Merge branch 'master' of gitorious.org:statusnet/mainline