Merge tag '1.18.2' into mob
commita09cc8986b84f72e4afac6a5527ad56e3c77d6f3
authorStefan Becker <chemobejk@gmail.com>
Sat, 7 Jun 2014 14:25:24 +0000 (7 17:25 +0300)
committerStefan Becker <chemobejk@gmail.com>
Sat, 7 Jun 2014 14:25:24 +0000 (7 17:25 +0300)
treecac41f9e4ec320a02ae79949ea9e3d3f5428cf66
parentfe8c19ac5be4e1af6c272cad3e7b25c017af3e4a
parent50879d356eb3182f1ce38573e1421fdaa8910f75
Merge tag '1.18.2' into mob

Release 1.18.2 -- Bug Fixes II

Conflicts:
contrib/opensuse-build-service/pidgin-sipe.changes
siplcs.vcxproj
siplcs.vcxproj