Merge branch 'branch-1.13.2' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 4 May 2013 22:52:01 +0000 (00:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 4 May 2013 22:52:01 +0000 (00:52 +0200)
* branch-1.13.2:
  maint: version bump after beta release 1.13.1d
  release: beta release 1.13.1d (will become 1.13.2)
  NEWS: document more robust handling/recognition of make options

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
NEWS

diff --cc NEWS
Simple merge