[Erc-commit] [commit][erc--main--0] Merged from erc--rel--5.2

[mwolson]

Revision: erc--main--0--patch-144
Archive: address@hidden
Creator: Michael Olson <address@hidden>
Date: Sun May 20 21:05:22 EDT 2007
Standard-date: 2007-05-21 01:05:22 GMT
New-files: .arch-ids/erc-pkg.el.id erc-pkg.el
Modified-files: ChangeLog Makefile erc-nicklist.el
New-patches: address@hidden/erc--main--0--patch-144
    address@hidden/erc--rel--5.2--patch-19
    address@hidden/erc--rel--5.2--patch-20
    address@hidden/erc--rel--5.2--patch-21
    address@hidden/erc--rel--5.2--patch-22
Summary: Merged from erc--rel--5.2
Keywords: merge

Patches applied:

 * address@hidden/erc--rel--5.2--patch-19
   Make an ELPA package for ERC

 * address@hidden/erc--rel--5.2--patch-20
   Makefile: Improve Debian package building

 * address@hidden/erc--rel--5.2--patch-21
   erc-nicklist: Use locate-library to find images dir

 * address@hidden/erc--rel--5.2--patch-22
   Include erc-nicklist.el and images in extras tarball