summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@collabora.co.uk>2011-04-05 16:33:40 +0100
committerVivek Dasmohapatra <vivek@collabora.co.uk>2011-04-05 16:33:40 +0100
commit8334d2fe4ec2b867200906a362a3dad0bbdb260b (patch)
tree203376ca27fb309927412abf64143ffd9cc86d37
parent691dcf70772574340b4532813da42c741fe8446a (diff)
downloadtelepathy-mission-control-8334d2fe4ec2b867200906a362a3dad0bbdb260b.tar.gz
Merge HEAD, branch 'master' into telepathy-mission-control-5.7
0 files changed, 0 insertions, 0 deletions