Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ecfbbdf1e04900b9fbc83a58563ed4d910d93f5a
commit ecfbbdf1e04900b9fbc83a58563ed4d910d93f5a Merge: c98caf2 4c322e8 Author: James Buren <[email protected]> Date: Fri May 25 12:20:00 2012 -0500 Merge branch 'master' of ../current Conflicts: source/apps-extra/virtualbox-modules/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
