po/POTFILES.in
author James Bowes <jbowes@redhat.com>
Fri Jun 20 19:04:47 2008 -0400 (2008-06-20)
changeset 258 29d5002bd17f
child 378 ee438b1e94c0
permissions -rw-r--r--
Merge branch 'krh/master'

Conflicts:

librazor/razor.h
librazor/rpm.c
razor.c
src/main.c