Merge branch 'folks-async-and-prepare'
authorTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)
committerTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)
commit34e8fc1344c5433be1a9d8f8614cdb84933a84fb
tree81cacf070d6f80ad2a1418bf37f753d40f7ae599
parent4ca3b29b70ca4f624153783c26f0d746f58003a8
parenta976f8193404e5c89d0a9a9051f629057e200f9b
Merge branch 'folks-async-and-prepare'