diff lisp/vc/ediff-help.el @ 109874:832428782d9f

merge from trunk, no conflicts
author Joakim <joakim@localhost.localdomain>
date Wed, 18 Aug 2010 13:11:01 +0200
parents c77749185234
children 1b626601d32d
line wrap: on
line diff