# HG changeset patch
# User Mahlon E. Smith <mahlon@laika.com>
# Date 1407781533 25200
# Node ID b5adcd83b1527a6c8b66652dc9e78d9d07c2c1c5
# Parent  feb78b7417ee6e6a22ac69bdc87b88a322824da9# Parent  5a0c99ca0c0dc52ddab5a7f67ed0d497eff06755
Branch merge.

diff -r feb78b7417ee -r b5adcd83b152 .hgtags
--- a/.hgtags	Mon Aug 11 11:19:43 2014 -0700
+++ b/.hgtags	Mon Aug 11 11:25:33 2014 -0700
@@ -6,4 +6,5 @@
 27bbe75233a3da1482fededd7f67215bc716b2d5 1.0.0
 0cc20d93ff50438fcb3fec864474b3cab492dd1a 1.0.1
 94b64bbf93cfdfaf0ee68c54cd60bd85865fcb47 1.0.2
+e1728adb2561a87a3ab10e57ae4b3140abf4b5cf 1.1.0
 1a480ba231b6ef7714a08151434b7773a1851936 1.2.0
diff -r feb78b7417ee -r b5adcd83b152 shelldap
--- a/shelldap	Mon Aug 11 11:19:43 2014 -0700
+++ b/shelldap	Mon Aug 11 11:25:33 2014 -0700
@@ -145,6 +145,8 @@
 
 =back
 
+=over 4
+
 =item B<sasl>
 
 A space separated list of SASL mechanisms.  Requires the Authen::SASL
@@ -655,7 +657,7 @@
 	if ( $use_temp ) {
 		my ( undef, $fname ) =
 		  File::Temp::tempfile( 'shelldap_XXXXXXXX', SUFFIX => '.ldif', DIR => '/tmp', UNLINK => 1 );
-		$self->{'ldif'}	      = Net::LDAP::LDIF->new( $fname, 'w', sort => 1, wrap => 0 )
+		$self->{'ldif'}	      = Net::LDAP::LDIF->new( $fname, 'w', sort => 1, wrap => 0 );
 		$self->{'ldif_fname'} = $fname;
 	}
 
@@ -1587,6 +1589,7 @@
 		}
 		close LDIF;
 	}
+
 	# checksum it, then open it in an editor
 	#
 	my $hash_orig = $self->chksum( $self->{'ldif_fname'} );