diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-21 13:39:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-21 13:39:57 -0600 |
| commit | c0641e617e036ed721ec9f8d4eac4a290deb5c7b (patch) | |
| tree | f4c576399fde2f42825df7b55fdfd42050a4ee5e /admin | |
| parent | 5c467e3693a7f8a14577d76ba9d65b8400bac319 (diff) | |
| parent | 01adb516f67bb6ba999f4fe90d085a506c5335c9 (diff) | |
| download | kopete-otr-c0641e617e036ed721ec9f8d4eac4a290deb5c7b.tar.gz kopete-otr-c0641e617e036ed721ec9f8d4eac4a290deb5c7b.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kopete-otr
Diffstat (limited to 'admin')
| m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347 +Subproject d3351c945e680cea403e463eb9898467db140ec |