commit 5620f96305ee276ac758de989589a93de89ed40a
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 14:17:21 2010 -0500

    silence some false-alarm uninitialised warnings

 glib/gvariant-parser.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 6f330383974bb235d7050ebef61426541823c33a
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 14:04:07 2010 -0500

    gtk-doc fixups

 docs/reference/glib/glib-sections.txt       |    2 +-
 docs/reference/gobject/gobject-sections.txt |    2 ++
 glib/ghash.c                                |    4 ++--
 glib/gvariant-parser.c                      |    7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

commit c5a1c95b1f991db6700a204e5d41c8cc650c7d42
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 13:46:09 2010 -0500

    GVariant docs fixes

 glib/gvariant-parser.c |   16 +++++++++++++++-
 glib/gvariant.h        |    6 +++---
 2 files changed, 18 insertions(+), 4 deletions(-)

commit 5c419c300b43b4e3ac462761dda4360ed1c5de9b
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 13:07:36 2010 -0500

    gitignore for win32 build stuff

 .gitignore                 |    1 +
 build/win32/vs9/.gitignore |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

commit bf4dbdbf0e1a3ac4349980942b9e91056ce7e448
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 12:31:46 2010 -0500

    merge GVariant parser

 docs/reference/glib/glib-sections.txt |    7 +
 glib/Makefile.am                      |    1 +
 glib/glib.symbols                     |    7 +
 glib/gvariant-parser.c                | 2185
 +++++++++++++++++++++++++++++++++
 glib/gvariant.c                       |   28 +-
 glib/gvariant.h                       |   13 +
 glib/tests/gvariant.c                 |  249 ++++-
 7 files changed, 2473 insertions(+), 17 deletions(-)

commit 2a209cb2516999c4d2f08368c720f7506acde9a5
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 21 12:54:36 2010 -0500

    make check / makedistcheck fixes

 configure.in            |    1 -
 gobject/gobject.symbols |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

commit 3369548130bdd02534f2a6c6e7baa1f29375a41d
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sun Mar 21 16:54:11 2010 +0200

    Add new headers to be installed the VS "install" project

    Yeah, we should generate the list of headers to install from the
    corresponding Makefile.am files, like the lists of source files to
    compile.

 build/win32/vs9/glib.vsprops |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 226cc663e40606e9749a368e9d2b2e61d9a9d532
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sun Mar 21 16:11:49 2010 +0200

    Avoid much of duplication in lists of source files

    Don't keep the lists of source files for libglib, libgobject and
    libgio in the VS project files in addition to the canonical location,
    the corresponding Makefile.am files.

    Instead, generate the corresponding .vcproj files at make dist time
    using the C preprocessor, from template files called .vcprojin. We
    still list explicitly in the .vcprojin files some of the
    Windows-specific source files, and the sources files of gnulib and
    pcre.

 build/win32/vs9/Makefile.am      |    3 +
 build/win32/vs9/README.txt       |    3 +-
 build/win32/vs9/gio.vcproj       |  608
 --------------------------------------
 build/win32/vs9/gio.vcprojin     |  234 +++++++++++++++
 build/win32/vs9/glib.vcproj      |  570
 -----------------------------------
 build/win32/vs9/glib.vcprojin    |  298 +++++++++++++++++++
 build/win32/vs9/gobject.vcproj   |  281 ------------------
 build/win32/vs9/gobject.vcprojin |  218 ++++++++++++++
 gio/Makefile.am                  |   11 +-
 glib/Makefile.am                 |   11 +-
 gobject/Makefile.am              |   11 +-
 11 files changed, 785 insertions(+), 1463 deletions(-)

commit 504b8b8f0125dcba530d4f34c4beaaa129cc5d85
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sun Mar 21 14:50:45 2010 +0200

    Avoid struct stat issues with MSVC

 gio/giomodule.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 28b025de962a798fa7a9fb9adbfdfcc4852fddec
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sun Mar 21 13:33:44 2010 +0200

    Drop empty Tool elements from the project files for clarity

    Makes the files appear a bit simpler when edited manually.

 build/win32/vs9/gio.vcproj                         |   12 ------------
 build/win32/vs9/glib-genmarshal.vcproj             |   12 ------------
 build/win32/vs9/glib.vcproj                        |   12 ------------
 build/win32/vs9/gmodule.vcproj                     |   12 ------------
 build/win32/vs9/gobject.vcproj                     |   12 ------------
 build/win32/vs9/gspawn-win32-helper-console.vcproj |   12 ------------
 build/win32/vs9/gspawn-win32-helper.vcproj         |   12 ------------
 build/win32/vs9/gthread.vcproj                     |   12 ------------
 build/win32/vs9/testglib.vcproj                    |   12 ------------
 9 files changed, 0 insertions(+), 108 deletions(-)

commit 2ab76c5b3610faa20dfae2550688ab0d6620b29b
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sun Mar 21 11:22:06 2010 +0200

    Make the GVariant code compile with a non-gcc compiler

    In particular, tested with Microsoft Visual C 2008.

 glib/gvariant-core.c       |    2 +-
 glib/gvariant-serialiser.c |   28 ++++++++++++++--------------
 glib/gvariant.c            |    8 ++++++--
 glib/gvarianttypeinfo.c    |   22 ++++++++++++----------
 4 files changed, 33 insertions(+), 27 deletions(-)

commit dc51eff2a9ca234fbb09c7b94c4643ea3750d80d
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sat Mar 20 13:32:37 2010 +0200

    Update with new source files and dependencies

 build/win32/vs9/gio.vcproj     |   36
 ++++++++++++++++++++++++++++++++----
 build/win32/vs9/glib.sln       |    1 +
 build/win32/vs9/glib.vcproj    |   21 +++++++++++++++++++++
 build/win32/vs9/gobject.vcproj |    4 ++++
 4 files changed, 58 insertions(+), 4 deletions(-)

commit 782de94c587cc3eed53653443439b62aaee19200
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sat Mar 20 13:31:55 2010 +0200

    Drop the unmaintained vs8 project files from dist

 build/win32/Makefile.am |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 77cc740243e9f55603d833f129e999f8824a18f1
Author: Tommi Vainikainen <thv@iki.fi>
Date:   Sat Mar 20 00:01:00 2010 +0200

    Updated Finnish translation

 po/fi.po | 1052
 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 512 insertions(+), 540 deletions(-)

commit 34d0db361ea514c026c54f14853120d601e1d0b5
Author: A S Alam <aalam@users.sf.net>
Date:   Fri Mar 19 08:18:41 2010 +0530

    update Punjabi Translation

 po/pa.po | 1041
 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 512 insertions(+), 529 deletions(-)

commit bedaa8027537378c8b7fec68acb422eac44f240e
Author: Nikos Bakaoukas <nikolaos.x1@gmail.com>
Date:   Fri Mar 19 00:10:07 2010 +0200

    Updated Greek translation for glib

 po/el.po | 1117
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 559 insertions(+), 558 deletions(-)

commit 6243b1eb5f8f55abc8c05a18d7dfbdd7968fab50
Author: Dumitru Mișu Moldovan <dumol@gnome.ro>
Date:   Thu Mar 18 22:47:55 2010 +0200

    Updated Romanian translation

 po/ro.po |  964
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 482 insertions(+), 482 deletions(-)

commit 3628f7815d13d8b495cd27ce49f3c15372f23cfb
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:   Thu Mar 18 13:54:17 2010 +0100

    Updated LowGerman translation

 po/nds.po |   98
 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 49 insertions(+), 49 deletions(-)

commit 41383b303c0bb54da68bbf5500b5e2d9e552ab69
Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date:   Wed Mar 17 15:11:00 2010 +0100

    Bug 612502 - Add support for class private data

    This adds the two new functions g_type_add_class_private()
    and g_type_class_get_private() and a convenience macro
    for the getter G_TYPE_CLASS_GET_PRIVATE().

 gobject/gtype.c |  118
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 gobject/gtype.h |   21 ++++++++++
 2 files changed, 137 insertions(+), 2 deletions(-)

commit 2295ba857f09fa58c6e61ec4147536021055bbf6
Author: Benjamin Otte <otte@redhat.com>
Date:   Tue Mar 16 16:34:50 2010 +0100

    The fallback parameter to g_convert_with_fallback() should be const

    This patch makes it so.

 glib/gconvert.c |    2 +-
 glib/gconvert.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 751feb916ab2f0cd74839233101fc0b9d2fb994c
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Mon Mar 15 17:45:02 2010 -0400

    Bug 612502 - build fails on glib/tests/gvariant.c

    Fix two problems caught by Tim Rice.

      - non-constant expression used as array size
      - arithmetic on void *

 glib/tests/gvariant.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

commit 1953b4087f2852e43c0a4dd46bfbd6228135cf70
Author: Christian Persch <chpe@gnome.org>
Date:   Sun Feb 7 13:39:10 2010 +0100

    Use static assert over runtime assert if possible

    We can test the these at compile time. Bug #609231.

 glib/gmappedfile.c |   19 ++++++++++---------
 glib/gvariant.c    |   13 ++++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

commit 24aeaebc48a5636c2f5391de646225d1e471f7ba
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:   Mon Mar 15 14:18:48 2010 +0100

    Added LowGerman translation

 po/nds.po | 2135
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 2135 insertions(+), 0 deletions(-)

commit 2b1b1563a0119de94d2ec0d05f1db493872852dc
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:   Mon Mar 15 14:18:43 2010 +0100

    Added LowGerman translation

 po/LINGUAS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7e4d88b290589a2a91d90b084751002c246564d6
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 14 22:27:06 2010 -0400

    gvariant test: Remove unused variable

 glib/tests/gvariant.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 9f16c70c16ec90be209fdaa120d2810f4128f2f0
Author: Petr Kovar <pknbe@volny.cz>
Date:   Mon Mar 15 02:30:27 2010 +0100

    Update Czech translation

 po/cs.po |  948
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 478 insertions(+), 470 deletions(-)

commit 9dea0253a3ded0e32daa33f11850797109018326
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 14 15:55:48 2010 -0400

    GVariant: add loading, byteswapping, normalisation

 docs/reference/glib/glib-sections.txt |    4 +
 glib/glib.symbols                     |    5 +
 glib/gvariant-core.c                  |   61 +++++++++-
 glib/gvariant.c                       |  207
 +++++++++++++++++++++++++++++++++
 glib/gvariant.h                       |   10 ++
 glib/tests/gvariant.c                 |   72 ++++++++++++
 6 files changed, 355 insertions(+), 4 deletions(-)

commit 1ac590b7f728d4a029a354be9aad24863badba02
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sun Mar 14 13:04:43 2010 -0400

    GBuffer: very small cosmetic fix to header file

 glib/gbuffer.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 056feef60b79e867190697f2d26e3ac7edf903a5
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sat Mar 13 19:55:56 2010 -0500

    GVariantIter: expand the size of the dummy struct

    Will allow for some nice tricks in the future.

 glib/gvariant.c |    4 ++--
 glib/gvariant.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit f552689058c27ccebaf4271c4a5afc4197b74a8f
Author: Colin Walters <walters@verbum.org>
Date:   Sat Mar 13 18:11:31 2010 -0500

    [GDesktopAppInfo] New function g_desktop_app_info_get_filename

    This allows access to the full file path, where possible.

    https://bugzilla.gnome.org/show_bug.cgi?id=612832

 docs/reference/gio/gio-sections.txt |    1 +
 gio/gdesktopappinfo.c               |   17 +++++++++++++++++
 gio/gdesktopappinfo.h               |    2 ++
 gio/gio.symbols                     |    1 +
 4 files changed, 21 insertions(+), 0 deletions(-)

commit 1be8ad35144d34de99b6153cbbfa8f9add46888b
Author: Thomas Kristensen <thomas.k.kristensen@tandberg.com>
Date:   Sun Mar 14 11:47:17 2010 +0200

    Close the socket event in finalizer instead of in close method

    There might be a GSource attached to a GMainContext, about to be
    removed by a
    pending cancellation. Deleting the handle too early will trigger a
    g_warning in
    the "select()" call in GMainContext. Attached patch fixes this
    by deferring
    destruction of WSAEVENT object until GSocket's finalize().

    Patch from bug #612702.

    Signed-off-by: Tor Lillqvist <tml@iki.fi>

 gio/gsocket.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

commit 6c5d2798f600a0536306e1c67b2e26e2c6eff006
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:   Sat Mar 13 21:00:44 2010 +0100

    Update Galician translation

 po/gl.po |  974
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 480 insertions(+), 494 deletions(-)

commit 31cf766e647b46cd28cc6d2405c729d06063680d
Author: Friedel Wolff <friedel@translate.org.za>
Date:   Sat Mar 13 20:48:05 2010 +0100

    Add Afrikaans translation

 po/LINGUAS |    1 +
 po/af.po   | 2015
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2016 insertions(+), 0 deletions(-)

commit 62a133f55dcd5626e9583aabc2d95926936a8475
Author: Javier Jardón <jjardon@gnome.org>
Date:   Fri Mar 12 20:37:04 2010 +0100

    Improve the documentation about single include exceptions

    Also, reenable the compiling Glib application section
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=612736

 docs/reference/glib/compiling.sgml |    9 +++++++++
 docs/reference/glib/glib-docs.sgml |    1 +
 2 files changed, 10 insertions(+), 0 deletions(-)

commit 5b19345246aa179788b09b7a82702e79f9d815d8
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Fri Mar 12 15:38:47 2010 -0500

    Bug 610858 - gvariant test fails sometimes

    NaN floating point values get mangled when passing across the function
    call ABI on x86 so avoid using them to get rid of spurious failures.

    Reported by Christian Persch and reliably reproduced by Emilio Pozuelo
    Monfort.

 glib/tests/gvariant.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

commit a57522deae75264bade35eae8826cda2771530c6
Author: Tor Lillqvist <tml@iki.fi>
Date:   Fri Mar 12 10:42:43 2010 +0200

    The SO_KEEPALIVE value seems to actually be a char on Windows

    Do still use a BOOL variable, but initialize it to FALSE before the
    getsockopt(), and drop the assertion on Windows. Should fix bug

 gio/gsocket.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

commit 1caaa4f591ead74f0a146d73155f9cfb65899bed
Author: Javier Jardón <jjardon@gnome.org>
Date:   Wed Mar 10 05:06:50 2010 +0100

    [docs] Don't reference deprecated functions

    Use g_io_add_watch(), g_io_add_watch_full() and
    g_source_remove() instead the deprecated gtk_input_add_full(),
    gtk_input_remove(), gdk_input_add(), gdk_input_add_full() and
    gdk_input_remove()

 glib/giochannel.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

commit 95d42761a9fff5813db46a41bc2ec6c86a2eb947
Author: Miloš Popović <mpopovic@src.gnome.org>
Date:   Tue Mar 9 20:29:43 2010 +0100

    Updated Serbian translations

 po/sr.po       | 1017
 +++++++++++++++++++++++++++----------------------------
 po/sr@latin.po | 1028
 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 1013 insertions(+), 1032 deletions(-)

commit a85b9c4badf22777b1b099befcd9e033afa45dbf
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Tue Mar 9 13:34:00 2010 -0500

    'default: g_assert_not_reached();' to silence GCC

    Closes bug #612327 reported by Claudio Saavedra.

 glib/gvariant-serialiser.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 89fa967ba1c72081a1698d35e6c10c99190b612d
Author: Dagobert Michelsen <dam@opencsw.org>
Date:   Tue Mar 9 15:02:57 2010 +0100

    Use G_STRFUNC instead of explicit gcc-only __PRETTY_FUNC__

 glib/gvariant.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c69e6fd837cb92d0c7050d8ea2d0f98b6f70fbe8
Author: Behdad Esfahbod <behdad@behdad.org>
Date:   Mon Mar 8 14:28:23 2010 -0500

    Cosmetic

 glib/gmem.h |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

commit f6166be24d6c43ccbaf80439aefe8eff83e7843d
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Mon Mar 8 11:53:36 2010 -0500

    Bump version

 configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c58ce0e60c1a243df6326c26cf7d255d3af4ab2d
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Mon Mar 8 11:48:14 2010 -0500

    2.23.5

 NEWS              |   50 ++
 po/am.po          |   93 ++--
 po/ar.po          |   98 ++--
 po/as.po          |   98 ++--
 po/ast.po         |   98 ++--
 po/az.po          |   98 ++--
 po/be.po          |  102 +++--
 po/be@latin.po    |  102 +++--
 po/bg.po          |  942 ++++++++++++++++++-------------------
 po/bn.po          |   98 ++--
 po/bn_IN.po       |   98 ++--
 po/bs.po          |   98 ++--
 po/ca.po          |  952 +++++++++++++++++++-------------------
 po/ca@valencia.po |   98 ++--
 po/cs.po          |   97 ++--
 po/cy.po          |   98 ++--
 po/da.po          |  953 +++++++++++++++++++-------------------
 po/de.po          |  955 +++++++++++++++++++-------------------
 po/dz.po          |   98 ++--
 po/el.po          |   98 ++--
 po/en@shaw.po     |   98 ++--
 po/en_CA.po       |   98 ++--
 po/en_GB.po       |  942 ++++++++++++++++++-------------------
 po/eo.po          |   97 ++--
 po/es.po          |  951 +++++++++++++++++++-------------------
 po/et.po          |  477 +++++++++++++++++++-
 po/eu.po          | 1005 ++++++++++++++++++++-------------------
 po/fa.po          |   98 ++--
 po/fi.po          |   98 ++--
 po/fr.po          |  950 +++++++++++++++++++-------------------
 po/ga.po          |   94 ++--
 po/gl.po          |   97 ++--
 po/gu.po          |   98 ++--
 po/he.po          |   98 ++--
 po/hi.po          |   98 ++--
 po/hr.po          |   98 ++--
 po/hu.po          | 1021 ++++++++++++++++++++--------------------
 po/hy.po          |   94 ++--
 po/id.po          |   98 ++--
 po/is.po          |   98 ++--
 po/it.po          |  955 +++++++++++++++++++-------------------
 po/ja.po          |   98 ++--
 po/ka.po          |   98 ++--
 po/kn.po          |   98 ++--
 po/ko.po          |   97 ++--
 po/ku.po          |   93 ++--
 po/lt.po          |  942 ++++++++++++++++++-------------------
 po/lv.po          |   97 ++--
 po/mai.po         |   98 ++--
 po/mg.po          |   98 ++--
 po/mk.po          |   98 ++--
 po/ml.po          |   98 ++--
 po/mn.po          |   98 ++--
 po/mr.po          |   98 ++--
 po/ms.po          |   98 ++--
 po/nb.po          |  942 ++++++++++++++++++-------------------
 po/ne.po          |   98 ++--
 po/nl.po          |   98 ++--
 po/nn.po          |   98 ++--
 po/oc.po          |   93 ++--
 po/or.po          |   98 ++--
 po/pa.po          |   98 ++--
 po/pl.po          |  942 ++++++++++++++++++-------------------
 po/ps.po          |   94 ++--
 po/pt.po          |  952 +++++++++++++++++++-------------------
 po/pt_BR.po       |  942 ++++++++++++++++++-------------------
 po/ro.po          |   97 ++--
 po/ru.po          |  942 ++++++++++++++++++-------------------
 po/rw.po          |   98 ++--
 po/si.po          |   98 ++--
 po/sk.po          |   98 ++--
 po/sl.po          | 1324
 +++++++++++++++++++++++++---------------------------
 po/sq.po          |   98 ++--
 po/sr.po          |   98 ++--
 po/sr@ije.po      |   98 ++--
 po/sr@latin.po    |   98 ++--
 po/sv.po          | 1353
 ++++++++++++++++++++++++++---------------------------
 po/ta.po          |   98 ++--
 po/te.po          |   98 ++--
 po/th.po          |   97 ++--
 po/tl.po          |   98 ++--
 po/tr.po          |   98 ++--
 po/tt.po          |   93 ++--
 po/uk.po          |   98 ++--
 po/vi.po          |   98 ++--
 po/wa.po          |   98 ++--
 po/xh.po          |   98 ++--
 po/yi.po          |   97 ++--
 po/zh_CN.po       |   98 ++--
 po/zh_HK.po       |  968 +++++++++++++++++++-------------------
 po/zh_TW.po       |  953 +++++++++++++++++++-------------------
 91 files changed, 13883 insertions(+), 13260 deletions(-)