Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Mon, 22 Nov 2010 22:07:04 +0000 (08:07 +1000)
committerAnthony Towns <aj@erisian.com.au>
Mon, 22 Nov 2010 22:07:04 +0000 (08:07 +1000)
commit9a83e0dc79f7a7467c7814d58daa2a2b89e50972
treeb0e4611e412ac121f58b4cf60b7fe299d503e0a0
parent902735ffbfdd97672d52b09f17cdcd619193fd05
parenta79606a6507fc01a74910f7959e84c4e9a730714
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox