tokkee.org
Code
projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b68b937
6e318b5
)
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
author
octo
<octo>
Sat, 10 Jun 2006 14:54:58 +0000
(14:54 +0000)
committer
octo
<octo>
Sat, 10 Jun 2006 14:54:58 +0000
(14:54 +0000)
Trivial merge
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}