Merge soc.2008.masterpassword branch

Sun, 09 Jun 2013 19:54:46 +0200

author
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
date
Sun, 09 Jun 2013 19:54:46 +0200
changeset 34210
5a6598847e76
parent 33962
d44a3e57992c (diff)
parent 34209
9d68c7e54ee7 (current diff)
child 34212
76231c6158ba
child 34527
b711c042ec8b

Merge soc.2008.masterpassword branch

mercurial