![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200) |
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
Trivial merge