Merge remote branch 'mirumee/master'
commita4eed8a87365a37976b9519de802c627dea4d8e7
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:39:28 +0000 (28 10:39 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:39:28 +0000 (28 10:39 -0700)
treed3b58e9ca9d7a8d0c2aeb007e301143202e4bf23
parent4a87eabf73ce9b1f09cb7fb408e1fe785f1ebe20
parentdf0aa10610e36fd887b29cc59bc2fb3d967ef5ac
Merge remote branch 'mirumee/master'