Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sat, 20 Nov 2010 08:14:30 +0000 (18:14 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sat, 20 Nov 2010 08:14:30 +0000 (18:14 +1000)
commit0ecf033110084f1a8be98282d7029dc14f70dab5
tree3cd4f83bcf4b6bcbf9bd7223e81cbfc76285bf93
parent081fbd5715f9d3d81d98e149fb95d40447c07a79
parent71c41eadd12c3ece5fffce7669e4991778046d4e
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox