From: Florian Forster <octo@noris.net>
Date: Wed, 21 Oct 2009 09:34:07 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=19a08d266f623d3697b5ca55689bd57eeaae46a6;p=collectd.git

Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	.gitignore
---

19a08d266f623d3697b5ca55689bd57eeaae46a6
diff --cc .gitignore
index a46d6261,362e94fd..e8f9af66
--- a/.gitignore
+++ b/.gitignore
@@@ -58,7 -74,9 +58,10 @@@ bindings/perl/Collectd/pm_to_bli
  bindings/perl/blib/
  bindings/perl/pm_to_blib
  
 -# make dist stuff:
 -collectd-*.tar.gz
 -collectd-*.tar.bz2
 +# java stuff
 +bindings/java/java-build-stamp
 +bindings/java/org/collectd/api/*.class
 +bindings/java/org/collectd/java/*.class
+ 
+ # python stuff
+ *.pyc