diff etc/.gitignore @ 111267:7f0afd30f764

More merge fixes.
author Juanma Barranquero <lekktu@gmail.com>
date Sun, 31 Oct 2010 19:38:16 +0100
parents a927f31f34d5
children ef719132ddfa
line wrap: on
line diff