Merge remote branch 'dagget/master'
commit4ddf1d0314154616f8e06b39538e3a9390e3ad7a
authorScott Chacon <schacon@gmail.com>
Thu, 7 Jan 2010 04:08:22 +0000 (6 20:08 -0800)
committerScott Chacon <schacon@gmail.com>
Thu, 7 Jan 2010 04:08:22 +0000 (6 20:08 -0800)
tree6e46c6ac1030530c672676bea43c1d103a1ff01d
parent70044f2e6ca9a29b6c1294f5e7a19737c667640e
parentd5a2b8feef3857be91a90635642e6174b8b3794c
Merge remote branch 'dagget/master'