Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 20 Sep 2011 18:21:06 +0000 (20:21 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 20 Sep 2011 18:21:06 +0000 (20:21 +0200)
* maint:
  fix: typo in NEWS

1  2 
ChangeLog
NEWS

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge