Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:42:16 +0000 (21:42 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:42:16 +0000 (21:42 +0100)
commit170f7ca94f18bb66a6214b8384ca73767939ef7f
treeeca6585266313d9ae376f98392522aaee695895d
parentbbb394d586ae59366af31cd0b77434639e9bcf81
parent965e2fa8afd63c81e16dae41eeb6a4d7604cf16b
Merge branch 'upstream'

Conflicts:
src/connection.c