![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Sun, 10 Jun 2012 19:31:42 +0000 (21:31 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Sun, 10 Jun 2012 19:31:42 +0000 (21:31 +0200) | ||
| commit | 16c05e70b0ca531b85479c7bbfdbf4763c367c97 | |
| tree | 162655e018c3b40c13b9978ee5e66f5c37c7eadf | tree | snapshot |
| parent | 80b46fd4097faaf92dce69ffb01af14e871ed44f | commit | diff |
| parent | 397d4b45bec36f3296c29646900caa43e0cd7673 | commit | diff |
Merged branch 'collectd-4'.
Conflicts:
debian/changelog
debian/po/cs.po
debian/po/da.po
debian/po/de.po
debian/po/es.po
debian/po/fr.po
debian/po/nl.po
debian/po/pl.po
debian/po/pt.po
debian/po/pt_BR.po
debian/po/ru.po
debian/po/sv.po
Conflicts:
debian/changelog
debian/po/cs.po
debian/po/da.po
debian/po/de.po
debian/po/es.po
debian/po/fr.po
debian/po/nl.po
debian/po/pl.po
debian/po/pt.po
debian/po/pt_BR.po
debian/po/ru.po
debian/po/sv.po
13 files changed:
| debian/changelog | diff1 | | diff2 | | blob | history |
| debian/copyright | diff1 | | diff2 | | blob | history |
| debian/po/cs.po | diff1 | | diff2 | | blob | history |
| debian/po/da.po | diff1 | | diff2 | | blob | history |
| debian/po/de.po | diff1 | | diff2 | | blob | history |
| debian/po/es.po | diff1 | | diff2 | | blob | history |
| debian/po/fr.po | diff1 | | diff2 | | blob | history |
| debian/po/nl.po | diff1 | | diff2 | | blob | history |
| debian/po/pl.po | diff1 | | diff2 | | blob | history |
| debian/po/pt.po | diff1 | | diff2 | | blob | history |
| debian/po/pt_BR.po | diff1 | | diff2 | | blob | history |
| debian/po/ru.po | diff1 | | diff2 | | blob | history |
| debian/po/sv.po | diff1 | | diff2 | | blob | history |