Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=7a890aa364a1d65e7bd9da3112888608716910c0
commit 7a890aa364a1d65e7bd9da3112888608716910c0 Merge: 3b87f6b d9f6f56 Author: Miklos Vajna <[email protected]> Date: Wed Jan 22 16:49:23 2014 +0100 Merge branch 'master' of frugalware.org:/pub/frugalware/frugalware-current into 'lotesting' Conflicts: source/xapps/libreoffice/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
