t / .gitignoreon commit Merge branch 'maint' to sync with GIT 1.6.0.6 (efe05b0)
   1/trash directory*
   2/test-results