Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

This commit is contained in:
Paul Eggert 2013-01-02 08:13:04 -08:00
commit 0877d0dc24
2237 changed files with 2783 additions and 2620 deletions

View file

@ -1,6 +1,6 @@
;;; erc-track.el --- Track modified channel buffers
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: FSF