diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 12:55:31 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 12:55:31 +0100 |
| commit | 880a75bbf354d48a706c56afafd381040a1d9de8 (patch) | |
| tree | d19d27821d7f70646ceeb722cd336f463459d6bc /lib | |
| parent | 3157284e58195cab12a404752f7d96e3c4ea650b (diff) | |
| parent | 84a20687c54c84aa61c9f3a606c8eb3bd14a8544 (diff) | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
lib/ext/wocky
Diffstat (limited to 'lib')
| m--------- | lib/ext/wocky | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject d739d2e14952a1e75571de7839827d73f9568df +Subproject d6c995608d4840df2bef38a5baf8e5b0f90915f |