[glom/glom-1-12] 1.12.6

[Murray Cumming <murrayc src gnome org>]

commit f19996fcd87b406c2eee0a9d5eb609fd4adae0e8
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Feb 5 11:22:25 2010 +0100

    1.12.6

 ChangeLog    |    4 +++-
 NEWS         |    9 +++++++++
 configure.ac |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 94482e5..6df16af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.12.6 (stable):
+
 2010-01-26  Murray Cumming  <murrayc murrayc com>
 
 	libglom: Correct includes.
@@ -10,7 +12,7 @@
 	Fixed out-ouf-bounds access during CSV imports
 
 	* glom/import_csv/dialog_import_csv.cc (get_field_for_column): Added boundary
-	check for direct field access. Fixes bug #607938.
+	check for direct field access. Fixes bug #607938 (ialx).
 
 2010-01-25 Murray Cumming <murrayc murrayc com>
 
diff --git a/NEWS b/NEWS
index 101988a..b58d73c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+1.12.6 (stable):
+
+* Import: Fixed out-ouf-bounds crash.
+  (Michael Hasselmann)  Bug #607938 (ialx).
+* New file: Allow the title to contain quotes, avoiding weird errors.
+  (Murray Cumming) Bug #607957 (Michael Hasselmann)
+* libglom: Improved include paths used in headers.
+  (Murray Cumming)
+ 
 1.12.5 (stable):
 
 * List View: Don't chop off the bottom of text when using large fonts.
diff --git a/configure.ac b/configure.ac
index 3ea47ca..6e68155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.12.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.12.6], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])