From c1c5b32ae3062fe0e2cf3bb2e5c9c058a2145512 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Oct 27 2010 01:57:03 +0000
Subject: Merge branch 'f13' into f12


Conflicts:

	.gitignore
	389-dsgw.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 4db97bf..d1753e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-389-dsgw-1.1.5.tar.bz2
+*~
+389-dsgw-1.1.6.tar.bz2
diff --git a/389-dsgw.spec b/389-dsgw.spec
index 85d4cb3..5820b16 100644
--- a/389-dsgw.spec
+++ b/389-dsgw.spec
@@ -2,7 +2,7 @@
 
 Summary:          389 Directory Server Gateway (dsgw)
 Name:             389-dsgw
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
@@ -86,6 +86,10 @@ fi
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Fri Oct  8 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.6-1
+- bump version to 1.1.6
+- support for openldap
+
 * Thu Jan 14 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.5-1
 - bump version to 1.1.5
 - make sure we can find ICU genrb correctly on all platforms
diff --git a/sources b/sources
index caa1ee8..9cbbc99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a9931ea00229d6fd0aaca4f87389e10  389-dsgw-1.1.5.tar.bz2
+d1cecd96ff807e50590d8e330b0e4baf  389-dsgw-1.1.6.tar.bz2