Change 14705

tjuricek
Merge branch 'master' of gfprod:p4ruby-check

Conflicts:
    test/02_environment_test.rb
    test/98_unicode_test.rb

Imported from Git
 Author: Tristan Juricek <tjuricek@perforce.com> 1421272022 -0800
 Committer: Tristan Juricek <tjuricek@perforce.com> 1421272022 -0800
 sha1: 2a9e62acaaca876c3fd04cd3ea1c3228003885e2
 push-state: complete
 parent-changes: cab72389a4abd47d0ec2f148592ad0f640ec1c6b=[969219]/2950fbb70d4b00f06d1bf6a5474b0451e172a358=[985877]
2 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.