Merge remote branch 'mseppae/master'
commit6a44e9101f430d8a345fc94b2cb52feb49d7ee1e
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:42:48 +0000 (28 10:42 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:42:48 +0000 (28 10:42 -0700)
treef234636ef0729faa6db279a2d6580f53c12d0b9b
parentf373c004b80bff339e9ca3d5aa774037547faf03
parent6e5928ab0217ef2907a0a42c67658402ad26ebae
Merge remote branch 'mseppae/master'