From: Nick Bowler <nbowler@ellipticsemi.com>
Date: Wed, 21 May 2008 15:56:17 +0000 (-0400)
Subject: Merge git://git.draconx.com/fvwmconf
X-Git-Url: https://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/0e41b01616fa8eecd6054393877a8c048c93889d

Merge git://git.draconx.com/fvwmconf

Conflicts:

	scripts/C/Makefile
---

0e41b01616fa8eecd6054393877a8c048c93889d