Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 16 Feb 2012 09:35:19 +0000 (10:35 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 16 Feb 2012 09:35:19 +0000 (10:35 +0100)
* maint:
  update-copyright: don't touch files synced from external packages

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge