Merge tag '1.17.2' into mob
commit59876acad89865aed1d433ef9871d5a73924ad96
authorStefan Becker <chemobejk@gmail.com>
Sat, 30 Nov 2013 17:13:20 +0000 (30 19:13 +0200)
committerStefan Becker <chemobejk@gmail.com>
Sat, 30 Nov 2013 17:13:20 +0000 (30 19:13 +0200)
treead5bfb829392eafc16fa5a0f39abd5e6606e61ef
parent9ca6c6efe728ad719f786e181c63f7e4bd3b6b96
parent241d71d33069fd87d4af6bdaca4ec85241045c44
Merge tag '1.17.2' into mob

Release 1.17.2 -- Bug Fixes II

Conflicts:
ChangeLog
siplcs.vcxproj
ChangeLog
siplcs.vcxproj
src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj