Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 22:34:50 +0000 (18:34 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 22:34:50 +0000 (18:34 -0400)
commit0cbb7411a69f63a4c2947d5c66e62f28e0714532
tree867f6ac395836c6a074d13f429d6d9ca7461bbdc
parent0503bcb0e2dd75de10a74ee5fc12d1523a44b028
parent1acb0c227dab546799131c824d57c6e5d58a5802
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing