summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-09 11:17:50 (GMT)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-09 11:17:50 (GMT)
commitbbdfac7000385ab414c34455cb862e916cf5402d (patch)
treef90c64135d45f0e9795e7a6c31ac8252455a8294
parent247fe13dd2dee1b332fbdad4effee97fc9e1d408 (diff)
parent677b984c434b31483e1348069e1463d963b077e1 (diff)
downloadwocky-bbdfac7000385ab414c34455cb862e916cf5402d.tar.gz
wocky-bbdfac7000385ab414c34455cb862e916cf5402d.tar.xz
Merge remote-tracking branch 'origin/gabble-0.18'
0 files changed, 0 insertions, 0 deletions