[glom/glom-1-20] 1.20.5

[Murray Cumming <murrayc src gnome org>]

commit e51433adeefc518252e95cc6b878a47ebf0db6f9
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 11 10:04:32 2012 +0100

    1.20.5

 ChangeLog    |    2 ++
 NEWS         |    7 +++++++
 configure.ac |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f504963..1542d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.20.5:
+
 2012-01-09  Murray Cumming  <murrayc murrayc com>
 
 	Translations: Prefer non-country-specific locales, such as de.
diff --git a/NEWS b/NEWS
index 370bdd9..0036d25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+1.20.5 (stable):
+
+* Detailsï Make restricted choices work.
+* Translations: Offer non-country-specific language locales too.
+* Command-line utilities: Initialize gettext and the locale.
+* DTD: formatting: Mention choices_restricted to fix make check.
+
 1.20.4 (stable):
 
 * Details: Really make non-editable multiline text fields non-editable.
diff --git a/configure.ac b/configure.ac
index 9c5759e..ce255bf 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.20.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.20.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])