chiark / gitweb /
Merge branch 'release'
authorRichard Kettlewell <rjk@terraraq.org.uk>
Sun, 19 May 2013 15:58:47 +0000 (16:58 +0100)
committerRichard Kettlewell <rjk@terraraq.org.uk>
Sun, 19 May 2013 15:58:47 +0000 (16:58 +0100)
Conflicts:
configure.ac
debian/changelog
debian/rules


Trivial merge