Revert previous merge which had extra changes.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324240 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/queuerules.conf.sample

@@ -7,7 +7,7 @@
 ;
 ; Note: There is a limitation to these rules; a caller will follow the penaltychange rules for
 ; the queue that were defined at the time the caller entered the queue. If an update to the rules is
-; made during the caller's stay in the queue, these will not be reflected for that caller.
+; made during the the caller's stay in the queue, these will not be reflected for that caller.
 ;
 ; The syntax for these rules is
 ; penaltychange => <number of seconds into the call>,<absolute or relative change to QUEUE_MAX_PENALTY>[,absolute or relative change to QUEUE_MIN_PENALTY]

contrib/scripts/asterisk.logrotate

@@ -5,8 +5,6 @@ __LOGDIR__/debug __LOGDIR__/console __LOGDIR__/full __LOGDIR__/messages __LOGDIR
 	compress
 	delaycompress
 	notifempty
-	#
-	# make sure the user and group matches what Asterisk is running as
 	create 640 root root 
 	sharedscripts
 	postrotate