Merge commit 'origin' carl/master
authorCarl Baldwin <carl@ecbaldwin.net>
Sat, 13 Feb 2010 05:09:53 +0000 (22:09 -0700)
committerCarl Baldwin <carl@ecbaldwin.net>
Sat, 13 Feb 2010 05:09:53 +0000 (22:09 -0700)
1  2 
rip_dvd
rip_dvd.conf.dist
rip_dvd.wrap

diff --cc rip_dvd
Simple merge
Simple merge
diff --cc rip_dvd.wrap
Simple merge