Merge branch 'master' of git://mikachu.ath.cx/openbox
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:11:17 +0000 (09:11 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:11:17 +0000 (09:11 -0400)
commit58c6a8e8da4445c178bdc332f6613edcb20d5c39
tree387121a386b3d55dacac6b78fc99069cad02bee2
parent768d0a023c0e350d1823631fe1a31459b90cc76b
parentdd2bc1b55cda8b3dbda37d520db57f02118498e0
Merge branch 'master' of git://mikachu.ath.cx/openbox