Merge branch 'master' of github.com:jaywhy/pdf-stamper · jaywhy/pdf-stamper@730cd9b · GitHub

Commit

Merge branch 'master' of github.com:jaywhy/pdf-stamper

Browse files

Conflicts:
	History.txt
	Manifest.txt
	README.rdoc
	Rakefile
	ext/iText-4.2.0.jar
	lib/pdf/stamper.rb
	lib/pdf/stamper/jruby.rb
	lib/pdf/stamper/rjb.rb
	pdf-stamper.gemspec

Loading branch information

jaywhy committed Dec 3, 2012

2 parents d524041 + f93540a commit 730cd9b