tokkee.org

Code

projects / pkg-collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 650a298 68b493b)

author	Bernd Zeimetz <bernd@bzed.de>
	Thu, 10 Sep 2015 12:55:34 +0000 (14:55 +0200)
committer	Bernd Zeimetz <bernd@bzed.de>
	Thu, 10 Sep 2015 12:55:34 +0000 (14:55 +0200)
commit	f3dfada3c7fb1b6a6125cafc5172881a0a3e10c1
tree	0d8a4e1201a8f14c01ef5ec05d5b53a58d18153b	tree \| snapshot
parent	650a29812ad5bdddc687e577330c637a7227acf2	commit \| diff
parent	68b493b30dec1560af38a79e64ea799972aef34b	commit \| diff

Merge branch 'master' into jessie-backports

debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/gbp.conf	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.