Merge branch 'master' into experimental/petef-jruby

This commit is contained in:
Pete Fritchman 2011-02-19 11:47:02 -08:00
commit 4d395c8674
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
.*.swp
*.gem
local
test/setup

View file

@ -1,4 +1,4 @@
Copyright 2009-2010 Jordan Sissel, Pete Fritchman, and contributors.
Copyright 2009-2011 Jordan Sissel, Pete Fritchman, and contributors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.