From: Nick Bowler <draconx@gmail.com>
Date: Sun, 1 Jun 2008 23:42:32 +0000 (-0400)
Subject: Merge branch 'master' of atropos:.fvwm
X-Git-Url: https://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/f0b5b8ca7eb9a95227c5946f5f7dbfce08b8ef73?hp=f0b5b8ca7eb9a95227c5946f5f7dbfce08b8ef73

Merge branch 'master' of atropos:.fvwm

Conflicts:

	scripts/mpdmenu.pl
---