summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-02 18:55:09 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-02 18:55:09 +0100
commit40674069bb850f4edc888fb722139484148a7637 (patch)
treecb42e62b9a8f4356a5c717e8cc2411bbafe6db2a /README
parentbce60b7be08c6d03bdd442dd20e96febb4ba8bbf (diff)
parentf8203b13985bb0627f8ae0b83887df838318e798 (diff)
downloadtelepathy-haze-40674069bb850f4edc888fb722139484148a7637.tar.gz
Merge branch 'telepathy-haze-0.8'
Conflicts: NEWS configure.ac
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions