From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 17 Feb 2014 15:48:34 +0000 (+0530)
Subject: Merge branch 'trac2430'
X-Git-Tag: bind10-1.2.0beta1-release~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b05064f681231fe7f8571253c5786f4ff0f2ca03;p=thirdparty%2Fkea.git

Merge branch 'trac2430'
---

b05064f681231fe7f8571253c5786f4ff0f2ca03
diff --cc tests/lettuce/configurations/.gitignore
index 7514b3b99b,50013a55ed..f534cf654b
--- a/tests/lettuce/configurations/.gitignore
+++ b/tests/lettuce/configurations/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  /bindctl_commands.config
  /example.org.config
+ /generate.config
  /root.config
 +/static.config