[389-admin/f12/master: 4/4] Merge branch 'f13' into f12

[Richard Allen Megginson]

commit a064fa81b09a48efe73807a9adec313413567fc2
Merge: 4f5a7b9 9a50eb2
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 13:00:32 2010 -0600

    Merge branch 'f13' into f12
    
    Conflicts:
    
    	389-admin.spec

 .gitignore             |    2 +-
 389-admin-git-local.sh |    6 ++++--
 389-admin-git.sh       |    2 +-
 389-admin.spec         |   13 +++++++++----
 sources                |    2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)
---
diff --cc 389-admin.spec
index 7bc46c1,0d8197a..07002f9
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -8,8 -8,8 +8,7 @@@
  
  Summary:          389 Administration Server (admin)
  Name:             389-admin
- Version:          1.1.11
- Release:          %{?relprefix}1%{?prerel}%{?dist}
+ Version:          1.1.12
 -Release:          %{?relprefix}2%{?prerel}%{?dist}
  License:          GPLv2 and ASL 2.0
  URL:              http://port389.org/
  Group:            System Environment/Daemons