From 30b43508092659adc0a9f7f038c5e0f9f4435de3 Mon Sep 17 00:00:00 2001
From: Zachary Scott <e@zzak.io>
Date: Wed, 25 Mar 2015 21:33:52 -0700
Subject: Upstream the following commits from trunk ruby:

- r49681: 97f9589c4b0641141af32244021dd9eba001b3c7
- r49682: c5d781dded856a86609ebd9fd4904c3e9f3474fd
- r49948: aaf2d070a8351dc3118422bae478978f3d3e3966
- r49954: ddf2558a167652cfec6a901b2116b832221e6e83b
- r49955: 9941f348e056a5e717cb943cee37ba8ba2396e6f

Fixes #6 and #7
---
 ext/openssl/ossl_asn1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/openssl/ossl_asn1.c')

diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 7efb0475..6c91d145 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -1424,7 +1424,7 @@ ossl_asn1obj_get_ln(VALUE self)
     return ret;
 }
 
-/* Document-method: OpenSSL::ASN1::ObjectId.oid
+/* Document-method: OpenSSL::ASN1::ObjectId#oid
  *
  * The object identifier as a +String+, e.g. "1.2.3.4.5"
  */
-- 
cgit v1.2.3