Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Wed, 24 Nov 2010 01:55:14 +0000 (11:55 +1000)
committerAnthony Towns <aj@erisian.com.au>
Wed, 24 Nov 2010 01:55:14 +0000 (11:55 +1000)
commita79225c215f17fa5218ddd9db4fc3f5c563a9f74
tree416eb433494b5fa45982df22cd47c1fbb6f70bbb
parent84cd5d42d8b5659463544fe2a400758b56478609
parent853b7112e34212040c4cb7289f9cfdb2f3ea9f90
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox