| commit | 91f9f4147dae4aafe64fadb1279a44e7fea78733 | |
| author | Evan Schoenberg <evan@adiumx.com> | |
| Wed, 25 Oct 2006 22:32:03 +0000 (25 22:32 +0000) | ||
| committer | Evan Schoenberg <evan@adiumx.com> | |
| Wed, 25 Oct 2006 22:32:03 +0000 (25 22:32 +0000) | ||
| tree | 1df6b29709887c4d4a9347dc30c15b416f48e407 | treesnapshot (tar.gz zip) |
| parent | fd55d844eb114c95f8078817e5006d2734aea906 | commitdiff |
Merged [18058] and [18059]; this branch and the trunk should be kept in sync in terms of joscar until 1.0 is released
git-svn-id: svn://svn.adiumx.com/adium/branches/adium-1.0@18060 1c916fce-81e2-0310-a464-8ca513f45935
git-svn-id: svn://svn.adiumx.com/adium/branches/adium-1.0@18060 1c916fce-81e2-0310-a464-8ca513f45935