Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sat, 13 Nov 2010 14:29:11 +0000 (00:29 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sat, 13 Nov 2010 14:29:11 +0000 (00:29 +1000)
commit9c32b93ef5fb43558fb0179ea1b047e35b7ed6e8
tree5b9f4bcd21939cdc76aa1841f1983b0d18caf7f3
parent991541f57f065f429c6ec425efd6ac731280b2c1
parenta6f30fae906bd87dff192c5fd4d10df283f99930
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox