]> git.0d.be Git - empathy.git/commit
Merge remote branch 'cosimoc/tls-multireject' into conference
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Sep 2010 19:38:50 +0000 (20:38 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Sep 2010 19:38:50 +0000 (20:38 +0100)
commit589cddd9c1a7a0658e34c4c87a622e6335bb015f
tree6f35d68ca521fcfa7f91d9bdf5b6dea513babbb5
parent51cb1355ad28c5d96d097084fb7f236f94374f7b
parent923c077b85f4a6607e7e2ba0ea3a7f1c8b7d7ea1
Merge remote branch 'cosimoc/tls-multireject' into conference