From ca1ac6fb3418dca56c467b734d524b0b9b222270 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Nov 06 2010 14:00:45 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index bef6345..316600d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Botan-1.8.9.tbz
 /Botan-1.8.9.stripped.tbz
 /Botan-1.8.10.stripped.tbz
+/Botan-1.8.11.stripped.tbz
diff --git a/botan.spec b/botan.spec
index ada96d5..e2ced6c 100644
--- a/botan.spec
+++ b/botan.spec
@@ -1,5 +1,5 @@
 Name:           botan
-Version:        1.8.10
+Version:        1.8.11
 Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
@@ -119,6 +119,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Sat Nov  6 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.11-1
+- Update to 1.8.11.
+
 * Sat Sep  4 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.10-1
 - Update to 1.8.10.
 
diff --git a/repack.sh b/repack.sh
index 2bee0a1..a9c1a30 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.8.10
+version=1.8.11
 name=Botan-${version}
 suffix=.tbz
 newsuffix=.stripped.tbz
diff --git a/sources b/sources
index 19ddfd6..fa31b52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd70ee065b99e74ad5c058cbf6c18f26  Botan-1.8.10.stripped.tbz
+40456cf43c2396927da6c4ad3ccb3fac  Botan-1.8.11.stripped.tbz