summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-01 15:46:20 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-01 15:46:20 +0200
commitf33b6bb7407b0244da73ba69e8c288bc429b1f59 (patch)
treef796a7bf39db03d426a7065f4c2bcb1450885112
parente4a44eeb50141dc09a23227bd21610295aa28255 (diff)
parent2286d8f08cd6ab022fa6ff83f5fa0e84bdd6a738 (diff)
downloadtelepathy-logger-f33b6bb7407b0244da73ba69e8c288bc429b1f59.tar.gz
Merge remote-tracking branch 'origin/next' into merge
I didn't notice we already had a 'next' branch. :\
0 files changed, 0 insertions, 0 deletions