Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.
[bpt/emacs.git] / admin / bzrmerge.el
2011-01-12 Glenn Morris* admin/bzrmerge.el: Standardize copyright and license...
2011-01-02 Chong YidongMerge changes from emacs-23 branch
2010-12-27 Stefan Monnier* admin/bzrmerge.el: New file to help merge branches...