diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-17 11:05:19 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-17 11:05:19 (GMT) |
commit | 871160390bc342b66537db5e70f2bf13c6c08fc8 (patch) | |
tree | 4d2b9c0729b4a73198a708f9810c40974cb72556 /addressentry.py | |
parent | de4f66b03764fcaad3731d4567c5a324652be1e7 (diff) | |
parent | 1656a89381d8449b38410aef38437ee0cf9f3da3 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts:
webview.py
Diffstat (limited to 'addressentry.py')
0 files changed, 0 insertions, 0 deletions