git.samba.org / jelmer / ctrlproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26800df b6385f5)
[merge] gwalcmai
authorJelmer Vernooij <jelmer@samba.org>
Sun, 30 Jul 2006 15:33:53 +0000 (17:33 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 30 Jul 2006 15:33:53 +0000 (17:33 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.