Merge tag 'branchpoint-5.1' into release upstream/release 5.1
authorRichard Kettlewell <rjk@terraraq.org.uk>
Sun, 17 Feb 2013 16:25:28 +0000 (16:25 +0000)
committerRichard Kettlewell <rjk@terraraq.org.uk>
Sun, 17 Feb 2013 16:25:28 +0000 (16:25 +0000)
commit7489d3af05a4394e9621e14a196a9f6c4f788a26
treee316f8acff136cf70967658c40f53b705f5cc28b
parentfe428f434e04bb4d97bd3652d6f4238db0d8afd0
parent3697ed99d3aef46cb8de4c573657123459c22abb
Merge tag 'branchpoint-5.1' into release

Branch point for 5.1 release.

Conflicts:
configure.ac
debian/changelog
configure.ac
debian/changelog