ffignore @ 52dab2e4da1c

Merge.
author Steve Losh <steve@stevelosh.com>
date Wed, 21 Nov 2012 15:53:19 -0500
parents a59166904d96
children 78862604f6c8
syntax:literal
.DS_Store