Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:19:57 +0000 (16:19 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:19:57 +0000 (16:19 -0500)
commit3bd4397b6ec5212bfe53a36892746962dc45dbeb
tree0aa06742564779de5995e9145368da1275cee3bd
parent937b529893cb93859245ad2f0e46d31bfd2f8097
parent374888f5e9c3c98204a708ef40afec86d136d836
Merge branch 'backport' into work

Conflicts:

openbox/frame.c
obrender/image.c
openbox/frame.c