Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=0133cfdac795a837f87f82bfe670abfc28b945da
commit 0133cfdac795a837f87f82bfe670abfc28b945da Merge: 73326ac 2a3fd45 Author: James Buren <[email protected]> Date: Sat Nov 3 07:35:11 2012 -0500 Merge branch 'master' of ../current Conflicts: source/gnome-extra/dvdstyler/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
