Merge branch 'faves' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Thu, 17 Mar 2011 21:48:14 +0000 (14:48 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 17 Mar 2011 21:48:14 +0000 (14:48 -0700)
commitc70fdef368b2c6d77769d359f487953e303221f9
tree9b943e53a80341ecd4e15db7c7359030e8a152f6
parentcd4b23aa399a51744787e580f8dfdb3886bfc8f5
parented6d5c6e7a86d4e548a46f456f0314f1fbbe1c61
Merge branch 'faves' into 1.0.x