pidgin/pidgin

Manual merge. Only 1 conflict, in ChangeLog.
release-2.x.y
2014-01-09, Mark Doliner
89678e04a7ac
Parents 829e8731d60c1a77896fb629
Children 6bd2dd10e5da6057ecea67bf
Manual merge. Only 1 conflict, in ChangeLog.
1 files changed, 2 insertions(+), 5 deletions(-)
  • +2 -5
    ChangeLog
    • --- a/ChangeLog Thu Jan 09 21:12:37 2014 -0800
    +++ b/ChangeLog Thu Jan 09 21:17:31 2014 -0800
    @@ -1,15 +1,12 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    version 2.10.8:
    - Stock market:
    - * Ludicrous increases on mediocre worldwide economic data.
    + General:
    + * Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
    libpurple:
    * Impose maximum download size for all HTTP fetches.
    - General:
    - * Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
    -
    Pidgin:
    * Add Unity integration plugin.