Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Tue, 23 Nov 2010 00:14:55 +0000 (10:14 +1000)
committerAnthony Towns <aj@erisian.com.au>
Tue, 23 Nov 2010 00:14:55 +0000 (10:14 +1000)
commitd1005f68376d695039c314b8d7a68bbf9acbca4f
tree9352713fa7cb5f80614a170c29f2c4be0e8d30f5
parent9a83e0dc79f7a7467c7814d58daa2a2b89e50972
parent22c09781af1df4b38562b577e9926c23e4a397f2
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox