From 7f745dde6cb4b972be74862023aa2911ebe3cf3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Mar 2011 21:52:07 +0000
Subject: [PATCH] Updated for 2.1.2

---
 ChangeLog         | 9 +++++++++
 debian/changelog  | 6 ++++++
 rpm/freeside.spec | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2ca0bbf06..b8f0d663e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-22 14:05  ivan
+
+	* ChangeLog: 2.1.2
+
+2011-03-22 14:03  mark
+
+	* FS/FS/part_export/acct_google.pm: load modules correctly for
+	  acct_google
+
 2011-03-22 13:55  ivan
 
 	* Makefile, httemplate/docs/about.html: 2.1.2
diff --git a/debian/changelog b/debian/changelog
index d070c46c9..8f313ca86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeside (2.1.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Ivan Kohler <ivan-debian@420.am>  Tue, 22 Mar 2011 14:52:06 -0700
+
 freeside (2.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release
diff --git a/rpm/freeside.spec b/rpm/freeside.spec
index 548444e12..7201843d1 100644
--- a/rpm/freeside.spec
+++ b/rpm/freeside.spec
@@ -1,5 +1,5 @@
 %{!?_initrddir:%define _initrddir /etc/rc.d/init.d}
-%{!?version:%define version 2.1.1}
+%{!?version:%define version 2.1.2}
 %{!?release:%define release 8}
 
 Summary: Freeside ISP Billing System
-- 
2.11.0