summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-07 15:42:59 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-07 15:42:59 +0100
commit5776d2f6bf2dce4efc7754793abf9db1dd731c30 (patch)
tree17c4dfc032d5f496ad2ffe5f02e3d31fb3db1ad7
parent8eda2330d0353845167018e962157053d039a9c0 (diff)
parent83939c69969a369824bedae9146a80ab22f2dcc2 (diff)
downloadtelepathy-gabble-5776d2f6bf2dce4efc7754793abf9db1dd731c30.tar.gz
Merge remote-tracking branch 'origin/telepathy-gabble-0.18' into telepathy-gabble-0.18
m---------lib/ext/wocky0
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky
-Subproject 0db9f32fd023fc728abf1780c26b957102c3292
+Subproject f58bf0bb331a736b4a282452f70ca409de3fac7