From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 14 Oct 2010 14:05:15 +0000 (+0200)
Subject: Fix some rebase artifacts
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d162451a0113da1e012e007f848e38f07348d9d2;hp=d162451a0113da1e012e007f848e38f07348d9d2;p=chaz%2Fopenbox

Fix some rebase artifacts
---