Commit by markdoliner@pidgin.im on im.pidgin.pidgin.2.x.y :: 55e8711512be87f2d917ee78e0659ca9d27b8377 / (ChangeLog configure.ac):

*** Plucked rev 1270f4e5ab858ed24cdaf179e71fedea82ea9e09 (qulogic at pidgin dot im):
Check for libm. I think I read somewhere that GDK pixbuf dropped
its dependency on it, which is probably why this is showing up now.

Closes #14799.

Commit by markdoliner@pidgin.im on im.pidgin.pidgin.2.x.y :: fdd2e607e8dbe0cbd6584455a9e71b0659f2c29f / (2 files in 2 dirs):

*** Plucked rev 13d6e924c9257b20e21050646cab88043bdb2e15 (markdoliner at pidgin dot im):
Allow signing on with usernames containing periods and
underscores. Allow adding buddies containing periods
and underscores.

Fixes #13500.

*** Plucked rev 9bc480e430c705484b95bc77407b0956800cdab4 (grim at pidgin dot im):
Fix mark's commit and allow aim accounts to work again

Commit by markdoliner@pidgin.im on im.pidgin.pidgin.2.x.y :: 88da6e4911fa5d201d726aebc2d72c67b4e40abb /ChangeLog:

Add ChangeLog entries for other changes in this branch

Commit by markdoliner@pidgin.im on im.pidgin.pidgin.2.x.y :: 14d1bcdec5d90bcadbee7130f55ec007b7b01d14 /libpurple/protocols/oscar/peer.c:

*** Plucked rev 4b5c688e1486f88c95bbe6946367a00b2d1e02dd (markdoliner at pidgin dot im):
Adjust this debug statement. listener_ip is based off of the bos connection
fd, not the listener_fd, so it's more useful to log info about the bos conn
fd.

*** Plucked rev 9ac3dc3dac01d52f74ef1da3fe9122a233650e5a (markdoliner at pidgin dot im):
We don't need to abort the file transfer attempt entirely when this happens.
We can just try the next connection method (both users connect to a 3rd
party proxy)

*** Plucked rev 77872b7f18741bca0e5bda735debf9ea3e3d386f (markdoliner at pidgin dot im):
Move this check up a level so that it affects direct connections, too.

I think this will fix the crash reported in http://trac.adium.im/ticket/15839
Still not sure why ip_atoi fails here.

Commit by markdoliner@pidgin.im on im.pidgin.pidgin :: 77872b7f18741bca0e5bda735debf9ea3e3d386f /libpurple/protocols/oscar/peer.c:

Move this check up a level so that it affects direct connections, too.

I think this will fix the crash reported in http://trac.adium.im/ticket/15839
Still not sure why ip_atoi fails here.

Commit by markdoliner@pidgin.im on im.pidgin.pidgin :: 9ac3dc3dac01d52f74ef1da3fe9122a233650e5a /libpurple/protocols/oscar/peer.c:

We don't need to abort the file transfer attempt entirely when this happens.
We can just try the next connection method (both users connect to a 3rd
party proxy)

Commit by markdoliner@pidgin.im on im.pidgin.pidgin :: 4b5c688e1486f88c95bbe6946367a00b2d1e02dd /libpurple/protocols/oscar/peer.c:

Adjust this debug statement. listener_ip is based off of the bos connection
fd, not the listener_fd, so it's more useful to log info about the bos conn
fd.

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone.not-selector :: rcbbe6a548dd5d565dfd0601ba1df320a613d3dc6 / (2 files in 2 dirs): (link)

Implement 'not' selector function and corresponding tests

Example:
Show all revisions which have not been tested yet
mtn log -r not(c:testresult)

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone :: r377d75d780a12a552941539f2e6a6e8d609fadb7 /src/cmd_diff_log.cc: (link)

Print old + new revision IDs in diff header when both are explicitly specified

Commit by mfl@netspan.ch on com.xaraya.blocks.jamaica.serveralias :: rd57b57ab49ec5b48dd6f48a05be964513902e78b / (2 files in 2 dirs): (link)

minor changes to the config markup

Commit by mfl@netspan.ch on com.xaraya.core.bermuda :: r8d87316da00c14f7e75cb45a1bec39f65e917bc5 /html/lib/xaraya/templates.php: (link)

allow property template names different from the property name

Commit by mfl@netspan.ch on com.xaraya.core.bermuda :: r0fddeac73e297a879dbafb2a0415d828b62f6ddd / (166 files in 57 dirs): (link)

propagate from branch 'com.xaraya.core.jamaica' (head 26eeafb4a965292d48ad20d7bd832bbe0a8e1230)
            to branch 'com.xaraya.core.bermuda' (head 3573444f99541c5ba75c34b42861991b20637095)

Commit by mfl@netspan.ch on com.xaraya.core.bermuda :: r3573444f99541c5ba75c34b42861991b20637095 / (166 files in 57 dirs): (link)

propagate from branch 'com.xaraya.core.jamaica' (head 3e75997aa2ea60dac7598f484932a2a4a830a3a3)
            to branch 'com.xaraya.core.bermuda' (head 129496072cfbad5007507ac90e3e3ad741134faa)

Commit by qulogic@pidgin.im on im.pidgin.pidgin.2.x.y :: 57c389a367e2a0144578bfaea92d7cd3d24fa4b3 /libpurple/protocols/msn/contact.h:

Pluck change to contact server, to reduce DNS/SOAP requests.

*** Plucked rev 29d7774464931757420e92fcc1f58587c1f7886d (qulogic at pidgin dot im):
I keep seeing a 301 Moved Permanently for omega.contacts.msn.com,
so I think we do need to change this to local-bay.contacts.msn.com.

Commit by qulogic@pidgin.im on im.pidgin.pidgin :: f0388e54998489dbe4b6133796f77459f20fe884 /libpurple/protocols/msn/notification.c:

Fix indices for client capabilities and display pics.

Commit by qulogic@pidgin.im on im.pidgin.pidgin.2.x.y :: 18f2f94b625542348af0049e0132a83a1c58aef6 /libpurple/protocols/msn/oim.c:

Pluck fixes for OIM charset conversion.

*** Plucked rev 3053d6a37cc6d8774aba7607b992a4408216adcd (thijsalkemade at gmail dot com):
MSN Patch from Thijs (xnyhps) Alkemade which do verify/convert to UTF-8
incoming OIM.

Fixes #14884

*** Plucked rev ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e (masca at cpw dot pidgin dot im):
Apply second patch from xnyhps this time to show the message salvaged to user.

Refs #14884

*** Plucked rev b1b8c222ab921963f43e83502b6c6e2e4489a8c4 (qulogic at pidgin dot im):
Add newlines to debug messages, and word-wrap lines.

*** Plucked rev fdb56683f2b5f88f7b388aaef6c53c810d19e374 (qulogic at pidgin dot im):
We know the length of decode_msg here.

*** Plucked rev f12c9f6a6c31bcd3512f162209285a88a86595ff (qulogic at pidgin dot im):
This extra if-level can be dropped.

Commit by hyc@symas.com on im.pidgin.pidgin :: d036ab77d7427e7c652b235f4263d5b51cbd921a /ChangeLog:

ChangeLog conversation-extended patch.

Refs #14818.

Commit by qulogic@pidgin.im on im.pidgin.pidgin :: c1584182b85f99fa3507ea3f76b07865ee7e43f7 /libpurple/protocols/msn/ (6 files):

Drop support for protocols below 18.

Commit by qulogic@pidgin.im on im.pidgin.pidgin :: 85947d1d1e7c589daf8cd288a2fefd18888cb110 /finch/ (gntmenuutil.c gntmenuutil.h):

I should probably add these files, too...

Refs #14818.

Commit by mfl@netspan.ch on com.xaraya.core.jamaica.catscoremodule :: rb77cbdec19f36d2a2b53fe69b66cbc42afa2fe40 /html/code/modules/categories/ (5 files in 3 dirs): (link)

update to getting the categories property showinput working properly