Merge branch 'master' into rfc5766
commitd2bcec1f3e3a9837dae72c55efcc9dbb3de8010c
authorYouness Alaoui <youness.alaoui@collabora.co.uk>
Mon, 10 Jan 2011 17:53:24 +0000 (10 12:53 -0500)
committerYouness Alaoui <youness.alaoui@collabora.co.uk>
Mon, 10 Jan 2011 17:53:24 +0000 (10 12:53 -0500)
tree30c68570ca0f0d14d83f0356095301dc87aa56a7
parent796fd849f2c63c503a80361a282e57f26aa7a52a
parentdde88a9f085cdcf2760e5cd538198e40f5d3f881
Merge branch 'master' into rfc5766
agent/agent.c