Merge commit '1.9.1' into mob
commit4b55f0ca78afbf8e7cd560f2c957096da0333c45
authorStefan Becker <stefan.becker@nokia.com>
Tue, 16 Mar 2010 10:25:33 +0000 (16 12:25 +0200)
committerStefan Becker <stefan.becker@nokia.com>
Tue, 16 Mar 2010 10:25:33 +0000 (16 12:25 +0200)
tree1d757245eb1f0c02ae3d0eb35b35bf60e8d2d149
parent117b811dcfd37ca2261f1baaaf316a7488a85ac5
parentd821f48f19c90f511e92794c20b09b9cd4058926
Merge commit '1.9.1' into mob

Conflicts:
ChangeLog
NEWS
contrib/rpm/pidgin-sipe.spec
contrib/rpm/pidgin-sipe.spec