[389-ds-base/f18: 3/4] 6c0778f bumped version to 1.2.11.11

[Mark Reynolds]

commit 89da25723cab76b4d3561310c6c2dcf46929b22c
Merge: b84f9d9 8506832
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Mon Aug 20 14:04:58 2012 -0400

    6c0778f bumped version to 1.2.11.11
    
    Ticket 429 - added nsslapd-readonly to DS schema
    Ticket 403 - fix CLEANALLRUV regression from last commit
    Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values

 .gitignore               |    1 +
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   10 ++++++++++
 sources                  |    2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)
---
diff --cc 389-ds-base.spec
index 5a27a79,5f883b6..b4e0cdf
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -21,7 -21,7 +21,11 @@@
  
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
++<<<<<<< HEAD
 +Version:          1.2.11.10
++=======
+ Version:          1.2.11.11
++>>>>>>> master
  Release:          %{?relprefix}1%{?prerel}%{?dist}
  License:          GPLv2 with exceptions
  URL:              http://port389.org/