Merge remote branch 'XemilianoX/master'
commit5b3c47a98648fbc6db1f29c7d10aa5b45f5bab6e
authorScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:55:15 +0000 (1 11:55 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:55:15 +0000 (1 11:55 -0800)
tree86612e1793faf8b76cd134c24c970c2b8b9bd14a
parente75355b7792ed42abe483a1b7e8fc4ac41e185f9
parentdfabe371302f70ea2f15898c57075076017291f0
Merge remote branch 'XemilianoX/master'