Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Tue, 23 Nov 2010 15:53:46 +0000 (01:53 +1000)
committerAnthony Towns <aj@erisian.com.au>
Tue, 23 Nov 2010 15:53:46 +0000 (01:53 +1000)
commitae55a107f12546dc65f04618c7abc17beb920d73
tree56e238839af59a6558a64712f31a8014a1fb9bd2
parentd1005f68376d695039c314b8d7a68bbf9acbca4f
parent737f2fdd012202f453120ece117ae5e859b32082
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox