| commit | a42dd1c34568b06d660d0d5fa162f9ec8f46e1ec | |
| author | Stefan Becker <stefan.becker@nokia.com> | |
| Wed, 3 Nov 2010 11:50:33 +0000 (3 13:50 +0200) | ||
| committer | Stefan Becker <stefan.becker@nokia.com> | |
| Wed, 3 Nov 2010 11:50:33 +0000 (3 13:50 +0200) | ||
| tree | 30c0bd9631428c357085b264b780fc9d2081005f | treesnapshot (tar.gz zip) |
| parent | 1ad3fff0de805c87f5893ab3078d91281f0fb29a | commitdiff |
| parent | f87e2b6cc889ec674949b3db573cfaa1bd93a671 | commitdiff |
Merge commit '1.11.2' into mob
Conflicts:
ChangeLog
NEWS
contrib/opensuse-build-service/pidgin-sipe.spec
contrib/rpm/pidgin-sipe.spec
src/core/sip-transport.c
Conflicts:
ChangeLog
NEWS
contrib/opensuse-build-service/pidgin-sipe.spec
contrib/rpm/pidgin-sipe.spec
src/core/sip-transport.c
| ChangeLog | diff1 | diff2 | blobhistory |
| contrib/opensuse-build-service/pidgin-sipe.spec | diff1 | diff2 | blobhistory |
| contrib/rpm/pidgin-sipe.spec | diff1 | diff2 | blobhistory |