commit 089e67e2bee07b86596784ad13eb723b799c316b Merge: 5268f43 92a2b3d Author: Petr Bokoc pbokoc@redhat.com Date: Tue Jun 10 14:01:20 2014 +0200
Merge branch 'master' into F20
Conflicts: quickstart.cfg
en-US/Installation_Guide.ent | 2 +- en-US/Installation_Quick_Start_Guide.ent | 1 + en-US/Package_Selection_common-note-3.xml | 2 +- en-US/new-users.xml | 6 ++++++ publican.cfg | 2 +- quickstart.cfg | 1 + 6 files changed, 11 insertions(+), 3 deletions(-) ---
docs-commits@lists.fedoraproject.org