projects
/
srvx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
67ca3b7
3086ecd
)
Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
author
pk910
<philipp@zoelle1.de>
Mon, 7 Jan 2013 19:54:30 +0000
(20:54 +0100)
committer
pk910
<philipp@zoelle1.de>
Mon, 7 Jan 2013 19:54:30 +0000
(20:54 +0100)
Conflicts:
src/mod-hostserv.c
Trivial merge