Merge branch 'po/userdiff-csharp'
commita0b6a9d2b2b0667bc170c864a05b3ec4635a71bb
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:20:51 +0000 (21 23:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:20:51 +0000 (21 23:20 -0700)
tree1767f40391f3440d8b6e9ffb39976bec6fb707c8
parentbb8634b8d101816f4be055dac71392f1b15068de
parentb221207db9950cb0993a30f38540ff235a0af64e
Merge branch 'po/userdiff-csharp'

* po/userdiff-csharp:
  Userdiff patterns for C#