[tzdata/f14/master: 4/4] Merge remote branch 'origin/master' into f14/master
Petr Machata
pmachata at fedoraproject.org
Mon Jan 24 20:46:53 UTC 2011
commit a8480092753321b49a6afbcaa1a1322be0cd91df
Merge: 1f809e7 584a263
Author: Petr Machata <pmachata at redhat.com>
Date: Mon Jan 24 21:46:24 2011 +0100
Merge remote branch 'origin/master' into f14/master
Conflicts:
sources
tzdata.spec
.gitignore | 5 +++++
sources | 4 ++--
tzdata.spec | 10 +++++++---
3 files changed, 14 insertions(+), 5 deletions(-)
---
More information about the scm-commits
mailing list