Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=fadffd27e5761d981224d5a2cf2a283a8de642c6
commit fadffd27e5761d981224d5a2cf2a283a8de642c6 Merge: 3bb5765 e947b40 Author: Miklos Vajna <[email protected]> Date: Sun Jun 8 22:08:31 2014 +0200 Merge branch 'master' of frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/xapps/libreoffice/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
