git.samba.org / jelmer / ctrlproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a0a06b 1a0d68d)
Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 5 Apr 2009 23:42:35 +0000 (01:42 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 5 Apr 2009 23:42:35 +0000 (01:42 +0200)

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