Ted Zlatanov 28e0d0c95d Merge from origin/emacs-24 ... bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens. 16d4c1c A better fix for bug#19346 82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files. 3cf7629 Git ignore lib/std*.h 301a401 Always define `gnutls-available-p' even if GnuTLS is not available. d76b9b2 Don't break example string between 2 lines (bug#19257) 75b4857 Port commit-msg to mawk 9ac0332 Improve commit-msg messages and autosquash 0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300) 935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'. c2db939 python.el: Support interpreter paths with spaces d83f329 ChangeLog fix 0f9fbb9 Port commit-message checking to FreeBSD 9. 3db1ada admin/MAINTAINERS: Update my interests and responsibilities. 6382f24 * .gitignore: Ignore autosave files. Conflicts: ChangeLog lisp/progmodes/python.el src/gnutls.c		2014-12-12 19:23:19 -05:00
..
git-hooks	Merge from origin/emacs-24	2014-12-12 19:23:19 -05:00
snippet	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
dir_top	Stop keeping info/dir in the repository.	2013-12-12 00:54:21 -08:00
make-info-dir	Fix race in 'make info/dir', and speed it up.	2014-10-22 20:32:21 -07:00
move-if-change	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
msys-to-w32	build-aux/msys-to-w32: Simplify implementation and docstring.	2014-11-19 21:15:32 +01:00
update-copyright	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
update-subdirs	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00