+2006-03-23 Matthias Clasen <mclasen@redhat.com>
+
+ Retroactively branch for 2.10 before the last commit.
+
+ * glib/gtimer.c: Change to "Since 2.12".
+
2006-03-23 Emmanuele Bassi <ebassi@cvs.gnome.org>
* configure.in: Check for timegm.
* configure.in: Added "ka" (Georgian) to ALL_LINGUAS
-=======
2006-03-20 Matthias Clasen <mclasen@redhat.com>
* glib/gmem.c (profiler_log): use standard_calloc to allocate
* MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
->>>>>>> 1.2267
2006-03-15 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Only set the prgname