Merged in cmrd-senya/pidgin/irc-len-fix (pull request #100)

Fix issue #4753 with IRC message truncation irc-len-fix

Merge branch 'default' into xhaakon/default

Fix merge conflicts in mediamanager.c

media: clear USE_GSTREAMER macro from V&V source files

Merged in rw_grim/pidgin (pull request #97)

Cleanup some bonjour stuff

ignore a "build" directory

Bring this up to date with default

Merge fixup

(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip

mercurial