Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=093a5111ffd2d4529d6349107778c5c61032d374
commit 093a5111ffd2d4529d6349107778c5c61032d374 Merge: 142c8c3 2a1e103 Author: Miklos Vajna <[email protected]> Date: Wed Jan 18 17:25:10 2012 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/xapps/libreoffice/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
