Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Sat, 31 Oct 2009 17:05:22 +0000 (13:05 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 31 Oct 2009 17:05:22 +0000 (13:05 -0400)
commit08546e4fb403b55827e32b6d59369b371d2334ac
tree71fda68abaac8e2bf336110beafa0f6f7b98100a
parent9f7d390ad1ade40887398f0454e5aab4f0243fb9
parent8ce3adc76becfce9e7f8b572a9ba047f31f63043
Merge branch 'master' into testing