Merge branch 'jn/copyright'
commit1eab5db3ae69bb018426459b45609149c14b3f6a
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 28 Feb 2010 05:41:24 +0000 (27 23:41 -0600)
committerJonathan Nieder <jrnieder@gmail.com>
Sun, 28 Feb 2010 05:41:24 +0000 (27 23:41 -0600)
treef953f33d2f84a3880bdb8bd43a86bc6610511290
parent8f68eeb9a2a47f52cb050b7095701642b2c8544f
parent32b519231bd6125a4b3add6d79aa630c27d0583f
Merge branch 'jn/copyright'

* jn/copyright:
  Clean up copyright
  Overhaul debian/copyright to follow dep5

Conflicts:
debian/changelog
debian/changelog