diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
| commit | 191c2e330ab91f4b35860e08c5424667ed1893c5 (patch) | |
| tree | 986158bd87ca65c1a3a722f2593b9d32a1aede56 /metacontacts.cpp | |
| parent | f1a201a3c3aeb1ec731d50568eb583a21ed1440c (diff) | |
| parent | 3d4fe3639635d0496906fb56b8014b14b0fd1ec7 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
messages.cpp
Diffstat (limited to 'metacontacts.cpp')
0 files changed, 0 insertions, 0 deletions