Merge branch 'po/userdiff-csharp'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:20:51 +0000 (23:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:20:51 +0000 (23:20 -0700)
* po/userdiff-csharp:
Userdiff patterns for C#

Trivial merge