git.samba.org / jelmer / ctrlproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b509463 c51001d)
Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 6 Apr 2009 02:18:01 +0000 (04:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 6 Apr 2009 02:18:01 +0000 (04:18 +0200)

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