From: Dana Jansens <danakj@orodu.net>
Date: Tue, 26 Feb 2008 08:15:21 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7e47a57027e043d4fe908d5f0acb7882d4f9330f;p=manmower%2Fcgl.git

Merge branch 'backport' into work
---

7e47a57027e043d4fe908d5f0acb7882d4f9330f