Permalink
Browse files

Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts:
	lib/ruby/shared/krypt/hmac.rb
	lib/ruby/shared/krypt/provider.rb
  • Loading branch information...
2 parents 4f50ea0 + fc93953 commit be63f5804fdfd95508df6f365563198fd9b1594e @headius headius committed Feb 26, 2014
Showing with 0 additions and 0 deletions.

0 comments on commit be63f58

Please sign in to comment.