commit 566a31466a223f4b00165c71ceca01f767e12b62 Merge: 2d88ee6 7b8fb6d Author: Akira TAGOH tagoh@redhat.com Date: Thu Aug 19 14:11:13 2010 +0900
Merge remote branch 'origin/f14/master' into f13/master
Conflicts: .gitignore sources vlgothic-fonts.spec
sources | 2 +- vlgothic-fonts.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) ---
fonts-bugs@lists.fedoraproject.org