From: Jelte Jansen <jelte@isc.org>
Date: Tue, 27 Mar 2012 09:19:42 +0000 (+0200)
Subject: [master] Merge branch 'trac963'
X-Git-Tag: trac2351_base~226^2~116^2~95^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49ba2cf8ac63246f389ab5e8ea3b3d081dba9adf;p=thirdparty%2Fkea.git

[master] Merge branch 'trac963'
---

49ba2cf8ac63246f389ab5e8ea3b3d081dba9adf
diff --cc src/bin/xfrout/b10-xfrout.8
index 483e2c05f8,69682a3235..b3200b588f
--- a/src/bin/xfrout/b10-xfrout.8
+++ b/src/bin/xfrout/b10-xfrout.8
@@@ -7,8 -7,17 +7,17 @@@
  .\"    Source: BIND10
  .\"  Language: English
  .\"
 -.TH "B10\-XFROUT" "8" "February 28\&. 2012" "BIND10" "BIND10"
 +.TH "B10\-XFROUT" "8" "March 16\&. 2012" "BIND10" "BIND10"
  .\" -----------------------------------------------------------------
+ .\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ .\" http://bugs.debian.org/507673
+ .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ .ie \n(.g .ds Aq \(aq
+ .el       .ds Aq '
+ .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
  .\" disable hyphenation