diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-29 15:54:45 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-29 15:54:45 -0400 |
commit | 12c5786df4e74c143f24398b8d0028000b61daba (patch) | |
tree | a0f3136499610571b47289f6aa55659094024620 /doc/todo/fileupload/soc-proposal | |
parent | 73af360e994306c1d0b14a69a4aa04750e61f0ef (diff) | |
parent | 106578f524a7ef8184029ac393dbe9d68b017756 (diff) |
Merge branch 'tova' into autoconfig
Conflicts:
debian/changelog
Diffstat (limited to 'doc/todo/fileupload/soc-proposal')
0 files changed, 0 insertions, 0 deletions