Merge branch 'aj/xfuncname-ada'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:40:11 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:40:11 +0000 (10:40 -0700)
commitc4eed8689b635e4c27759479afd656ea770607b7
tree6707e3f8134a22da40e0248f167d3d1498654242
parentb1bb02dede05e26ae39908ae4ad35f011583bd50
parente90d065e64702d09fbdfc7cfd1c97456c7faa74c
Merge branch 'aj/xfuncname-ada'

* aj/xfuncname-ada:
  Add userdiff patterns for Ada
Documentation/gitattributes.txt