Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 16:11:24 +0000 (11:11 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 16:11:24 +0000 (11:11 -0500)
commit7d9cfbb26e5dd5b2b2628a570f419349c83b1f6d
tree6506df794a1abb0fff2c51f802a382ea142f4f5e
parentcba0e9273d1b778ceb0f568f0ca76667d3bbeacb
parentd3a01a40f35cb3ae6c5ad8329291e86e2e599691
Merge branch 'backport' into 3.4-working

Conflicts:

po/hu.po
po/lv.po
openbox/menuframe.h
openbox/openbox.c
parser/parse.c