Merge branch 'master' of git://orodu.net/openbox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 14 Jul 2007 13:25:41 +0000 (15:25 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 14 Jul 2007 13:25:41 +0000 (15:25 +0200)
commite2da61b2e7cbaace1f8799ec1fcd506c281892bf
treed3134f2e2030ade13f9a548e7751ce3e46112ee8
parent8ad51aef1e08623fb97437994d75366a3018e493
parent27a0f0f4c99bab0ceaa496f14c7498b230fcab25
Merge branch 'master' of git://orodu.net/openbox