From: Dana Jansens <danakj@orodu.net>
Date: Fri, 25 Jan 2008 03:06:48 +0000 (-0500)
Subject: Merge branch 'master' of git://mika.l3ib.org/obconf
X-Git-Tag: release-2.0.3~10
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4b9273e09f7e6af9465c849525ac98df3cfb9762;p=dana%2Fobconf.git

Merge branch 'master' of git://mika.l3ib.org/obconf

Conflicts:

	po/sv.po
---

4b9273e09f7e6af9465c849525ac98df3cfb9762