Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=melkotesting.git;a=commitdiff;h=6c47eb586481f9c8230ef26c0b294999500a8610
commit 6c47eb586481f9c8230ef26c0b294999500a8610 Merge: 6a44919 41ec4d7 Author: Melko <me...@frugalware.org> Date: Sun Aug 26 17:18:12 2012 +0200 Merge remote-tracking branch 'current/master' Conflicts: source/kde-extra/networkmanagement/FrugalBuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git