projects / licom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d8e49b 79fc18a)
Merge branch 'encode' into future
authorFlorian Forster <octo@verplant.org>
Mon, 11 Sep 2006 21:58:42 +0000 (23:58 +0200)
committerFlorian Forster <octo@verplant.org>
Mon, 11 Sep 2006 21:58:42 +0000 (23:58 +0200)
1  2 
licom.cgi patch | diff1 | diff2 | blob | history

diff --cc licom.cgi
Simple merge
The lightweight contact manager