summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-25 14:49:05 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-25 14:49:15 +0000
commitac0bd35b8aa939ffd824ef3145a77ed5546c85c6 (patch)
tree6067bfbad786b004a319babbfc34c4ee13ae4d3d /NEWS
parent875ba231e3f8b96614b4ad095e43207a5dafb14c (diff)
parent32fc8882892d533bf6d5e9b8c768a0940c73bad5 (diff)
downloadtelepathy-haze-ac0bd35b8aa939ffd824ef3145a77ed5546c85c6.tar.gz
Merge remote branch 'smcv/secret'
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions