Merge branch 'master' into f13

Conflicts:
	.gitignore
	rubygem-json.spec
This commit is contained in:
Xavier Lamien 2010-08-13 01:00:51 +02:00
commit 2d896e934d

2
.gitignore vendored
View file

@ -1 +1 @@
json-1.4.3.gem
json-1.1.7.gem