Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 06:08:37 +0000 (16:08 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 06:08:37 +0000 (16:08 +1000)
commitec47bc93a487614714a752cb30ec9fe3d8f72929
tree62796004aca74e1cbf5ed5ddffd9188bde4b98c1
parent0393830f85da5efc96bbdf0d9769b66019c34b33
parente7954c820763f80e993f9f822e837725cf36af84
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox