diff options
| author | Mark Doliner <mark@kingant.net> | 2014-02-01 11:13:25 -0800 |
|---|---|---|
| committer | Mark Doliner <mark@kingant.net> | 2014-02-01 11:13:25 -0800 |
| commit | 36894aed3781e49dd50071afd38fbe6db23d89ad (patch) | |
| tree | 26370bb7ee012796edf328a84300e502231eac22 /.tx | |
| parent | e98a7549ded9d7ca64a8439b8f037494d25ee230 (diff) | |
| parent | cfa7c0338b4a6890c08f4fd543ccf5c13e5df980 (diff) | |
| download | pidgin-36894aed3781e49dd50071afd38fbe6db23d89ad.tar.gz | |
Merge the release-2.x.y branch into default.
A few manual merges... nothing too bad.
Diffstat (limited to '.tx')
0 files changed, 0 insertions, 0 deletions