From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Jan 2010 16:11:24 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11~17
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7d9cfbb26e5dd5b2b2628a570f419349c83b1f6d;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	po/hu.po
	po/lv.po
---

7d9cfbb26e5dd5b2b2628a570f419349c83b1f6d