![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | bb18d8249033ec962eaed59651560e8f936d4a4e | |
| tree | ff4ed0a5f6d232d2a011948c8daa17e47dc569df | tree | snapshot |
| parent | b68b937de8b711f28cbac1440e6f6556b2f04809 | commit | diff |
| parent | 6e318b5f03c2cc8ec0c6262498f4b62e59c8b505 | commit | diff |
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk