Merge branch 'master' of git://people.freedesktop.org/~krh/razor
authorDan Winship <danw@gnome.org>
Thu, 13 Mar 2008 12:29:05 +0000 (08:29 -0400)
committerDan Winship <danw@gnome.org>
Thu, 13 Mar 2008 12:29:05 +0000 (08:29 -0400)
1  2 
rpm.c

diff --cc rpm.c
Simple merge