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)
commite01aadffbce28834777730d8bf66ae618587a526
tree777b394a547de06fc44a42c667aa1170829d5168
parentcd11cf109c517afa33ac512d3a71dcba6503d613
parent3ca74cd255eada152907980f2a064a5ee93f8e2c
Merge branch 'release'

Conflicts:
configure.ac
debian/changelog
debian/rules