Merge lp:~bkerensa/ubuntu/quantal/kubuntu-docs/fix-for-1049278 into lp:ubuntu/quantal/kubuntu-docs

[Benjamin Kerensa]

[Logan Rosen (logan)]

This has already been done in lp:kubuntu-docs, which is the upstream branch and the correct target for this merge.

review: Disapprove

Unmerged revisions

52. By Benjamin Kerensa on 2012-09-24

Fix for Duplicate Line

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-18 15:41:48 +0000
+++ debian/changelog	2012-09-24 10:37:06 +0000
@@ -1,3 +1,9 @@
+kubuntu-docs (12.10.0ubuntu2) quantal; urgency=low
+
+  * Fix for duplicate line (LP: #1049278)
+
+ -- Benjamin Kerensa <[e-mail]>  Mon, 24 Sep 2012 03:29:01 -0700
+
 kubuntu-docs (12.10.0ubuntu1) quantal; urgency=low
 
   * Updates for Quantal by [e-mail]

=== modified file 'docs/contact/C/contact.xml'
--- docs/contact/C/contact.xml	2012-07-18 15:41:48 +0000
+++ docs/contact/C/contact.xml	2012-09-24 10:37:06 +0000
@@ -150,8 +150,7 @@
       use with your &irc; client is <userinput>irc.freenode.net</userinput>, and 
       the most secure port is <userinput>8001</userinput>. The same channels are 
       available on the &ubuntu; network. The server address is 
-      <userinput>irc.ubuntu.com</userinput>, and the most secure port is 
-      <userinput>8001</userinput>.
+      <userinput>irc.ubuntu.com</userinput>.
     </para>
   </note>
   <variablelist>