Merge remote-tracking branch 'exalted/master'

This commit is contained in:
Justin Spahr-Summers 2012-08-27 09:21:15 -07:00
commit c61686f988

View File

@ -1,5 +1,6 @@
.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride
Icon Icon