]> err.no Git - dak/commitdiff
Merge branch 'master' into content_generation
authorMichael Casadevall <sonicmctails@gmail.com>
Sat, 3 Jan 2009 02:46:15 +0000 (21:46 -0500)
committerMichael Casadevall <sonicmctails@gmail.com>
Sat, 3 Jan 2009 02:46:15 +0000 (21:46 -0500)
1  2 
dak/dak.py
dak/process_accepted.py

diff --cc dak/dak.py
Simple merge
Simple merge