summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-26 11:37:53 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-26 11:37:56 +0100
commit726001d0d64457905c645bb9ade8aecbca756a0c (patch)
treea3fb9e31af8a0f4eb8950a59439ff471ebfbba57 /extensions
parenta242b118a7f4808342e522108da692e7264f7a40 (diff)
parent0d374be6fe41427482faa43995dedfdee836842e (diff)
downloadtelepathy-salut-726001d0d64457905c645bb9ade8aecbca756a0c.tar.gz
Merge branch 'trivia'
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28258
Diffstat (limited to 'extensions')
0 files changed, 0 insertions, 0 deletions